Bump v17.0.0-nightly.20211022

This reverts commit b8ea7bf90b.

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 # https://git-scm.com/docs/gitignore
 
 # Upgrades WG
-/patches/                               @electron/wg-upgrades @electron/wg-security
+/patches/                               @electron/wg-upgrades
 DEPS                                    @electron/wg-upgrades
 
 # Releases WG

BUILD.gn

@@ -420,6 +420,7 @@ source_set("electron_lib") {
   ]
 
   include_dirs = [
+    "chromium_src",
     ".",
     "$target_gen_dir",
 
@@ -553,9 +554,8 @@ source_set("electron_lib") {
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
     ]
 
+    sources += filenames.lib_sources_nss
     sources += [
-      "shell/browser/certificate_manager_model.cc",
-      "shell/browser/certificate_manager_model.h",
       "shell/browser/ui/gtk/app_indicator_icon.cc",
       "shell/browser/ui/gtk/app_indicator_icon.h",
       "shell/browser/ui/gtk/app_indicator_icon_menu.cc",
@@ -1386,13 +1386,11 @@ 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" ]
 }
 
@@ -1410,7 +1408,6 @@ group("electron_chromedriver") {
 dist_zip("electron_chromedriver_zip") {
   testonly = true
   data_deps = electron_chromedriver_deps
-  deps = data_deps
   outputs = [ "$root_build_dir/chromedriver.zip" ]
 }
 
@@ -1429,7 +1426,6 @@ group("electron_mksnapshot") {
 
 dist_zip("electron_mksnapshot_zip") {
   data_deps = mksnapshot_deps
-  deps = data_deps
   outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }
 
@@ -1440,7 +1436,6 @@ copy("hunspell_dictionaries") {
 
 dist_zip("hunspell_dictionaries_zip") {
   data_deps = [ ":hunspell_dictionaries" ]
-  deps = data_deps
   flatten = true
 
   outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
@@ -1454,7 +1449,6 @@ 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",
@@ -1470,7 +1464,6 @@ 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",

DEPS

@@ -15,9 +15,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '96.0.4664.174',
+    '96.0.4664.4',
   'node_version':
-    'v16.9.1',
+    'v16.11.1',
   '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

ELECTRON_VERSION

@@ -1 +1 @@
-16.0.10
+17.0.0-nightly.20211022

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 = 99
+node_module_version = 101
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0

chromium_src/BUILD.gn

@@ -15,10 +15,6 @@ static_library("chrome") {
   sources = [
     "//chrome/browser/accessibility/accessibility_ui.cc",
     "//chrome/browser/accessibility/accessibility_ui.h",
-    "//chrome/browser/app_mode/app_mode_utils.cc",
-    "//chrome/browser/app_mode/app_mode_utils.h",
-    "//chrome/browser/browser_features.cc",
-    "//chrome/browser/browser_features.h",
     "//chrome/browser/browser_process.cc",
     "//chrome/browser/browser_process.h",
     "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc",
@@ -55,20 +51,6 @@ static_library("chrome") {
     "//chrome/browser/process_singleton.h",
     "//chrome/browser/ui/browser_dialogs.cc",
     "//chrome/browser/ui/browser_dialogs.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",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_manager.cc",
-    "//chrome/browser/ui/exclusive_access/exclusive_access_manager.h",
-    "//chrome/browser/ui/exclusive_access/fullscreen_controller.cc",
-    "//chrome/browser/ui/exclusive_access/fullscreen_controller.h",
-    "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc",
-    "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h",
-    "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc",
-    "//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/views/autofill/autofill_popup_view_utils.cc",
     "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
@@ -132,7 +114,6 @@ static_library("chrome") {
     "//components/keyed_service/content",
     "//components/paint_preview/buildflags",
     "//components/proxy_config",
-    "//components/services/language_detection/public/mojom",
     "//content/public/browser",
     "//services/strings",
   ]

chromium_src/chrome/browser/certificate_manager_model.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.
 
-#include "shell/browser/certificate_manager_model.h"
+#include "chrome/browser/certificate_manager_model.h"
 
 #include <utility>
 

chromium_src/chrome/browser/certificate_manager_model.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
-#define SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 
 #include <memory>
 #include <string>
@@ -112,4 +112,4 @@ class CertificateManagerModel {
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };
 
-#endif  // SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
+#endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_

docs/README.md

@@ -59,9 +59,10 @@ an issue:
 * [Testing and Debugging](tutorial/application-debugging.md)
   * [Debugging the Main Process](tutorial/debugging-main-process.md)
   * [Debugging with Visual Studio Code](tutorial/debugging-vscode.md)
+  * [Using Selenium and WebDriver](tutorial/using-selenium-and-webdriver.md)
   * [Testing on Headless CI Systems (Travis, Jenkins)](tutorial/testing-on-headless-ci.md)
   * [DevTools Extension](tutorial/devtools-extension.md)
-  * [Automated Testing](tutorial/automated-testing.md)
+  * [Automated Testing with a Custom Driver](tutorial/automated-testing-with-a-custom-driver.md)
   * [REPL](tutorial/repl.md)
 * [Distribution](tutorial/application-distribution.md)
   * [Supported Platforms](tutorial/support.md#supported-platforms)

docs/api/app.md

@@ -36,10 +36,10 @@ Returns:
 * `launchInfo` Record<string, any> | [NotificationResponse](structures/notification-response.md) _macOS_
 
 Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
-holds the `userInfo` of the [`NSUserNotification`](https://developer.apple.com/documentation/foundation/nsusernotification)
-or information from [`UNNotificationResponse`](https://developer.apple.com/documentation/usernotifications/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()`
+holds the `userInfo` of the `NSUserNotification` or information from
+[`UNNotificationResponse`](structures/notification-response.md) 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.
 
 ### Event: 'window-all-closed'
@@ -501,16 +501,6 @@ gets emitted.
 **Note:** Extra command line arguments might be added by Chromium,
 such as `--original-process-start-time`.
 
-### Event: 'desktop-capturer-get-sources'
-
-Returns:
-
-* `event` Event
-* `webContents` [WebContents](web-contents.md)
-
-Emitted when `desktopCapturer.getSources()` is called in the renderer process of `webContents`.
-Calling `event.preventDefault()` will make it return empty sources.
-
 ## Methods
 
 The `app` object has the following methods:
@@ -940,9 +930,9 @@ app.setJumpList([
 ])
 ```
 
-### `app.requestSingleInstanceLock([additionalData])`
+### `app.requestSingleInstanceLock()`
 
-* `additionalData` Record<any, any> (optional) - A JSON object containing additional data to send to the first instance.
+* `additionalData` unknown (optional) - A JSON object containing additional data to send to the first instance.
 
 Returns `Boolean`
 

docs/api/browser-view.md

@@ -15,16 +15,14 @@ Process: [Main](../glossary.md#main-process)
 
 ```javascript
 // In the main process.
-const { app, BrowserView, BrowserWindow } = require('electron')
+const { BrowserView, BrowserWindow } = require('electron')
 
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600 })
+const win = new BrowserWindow({ width: 800, height: 600 })
 
-  const view = new BrowserView()
-  win.setBrowserView(view)
-  view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
-  view.webContents.loadURL('https://electronjs.org')
-})
+const view = new BrowserView()
+win.setBrowserView(view)
+view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
+view.webContents.loadURL('https://electronjs.org')
 ```
 
 ### `new BrowserView([options])` _Experimental_

docs/api/browser-window.md

@@ -391,7 +391,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       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`.
-  * `titleBarOverlay` Object | Boolean (optional) -  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][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
+  * `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjuction 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][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
     * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
     * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
 
@@ -559,7 +559,7 @@ Returns:
 
 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.
+Note that this is only emitted when the window is being resized manually. Resizing the window with `setBounds`/`setSize` will not emit this event.
 
 #### Event: 'move'
 
@@ -999,7 +999,7 @@ APIs like `win.setSize`.
   is `true`). Default is `#FFF` (white).
 
 Sets the background color of the window. See [Setting
-`backgroundColor`](#setting-the-backgroundcolor-property).
+`backgroundColor`](#setting-backgroundcolor).
 
 #### `win.previewFile(path[, displayName])` _macOS_
 
@@ -1044,7 +1044,7 @@ 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).
+`backgroundColor`](#setting-backgroundcolor).
 
 #### `win.setContentBounds(bounds[, animate])`
 
@@ -1697,7 +1697,7 @@ current window into a top-level window.
 
 #### `win.getParentWindow()`
 
-Returns `BrowserWindow | null` - The parent window or `null` if there is no parent.
+Returns `BrowserWindow` - The parent window.
 
 #### `win.getChildWindows()`
 

docs/api/clipboard.md

@@ -76,7 +76,7 @@ Writes `markup` to the clipboard.
 ```js
 const { clipboard } = require('electron')
 
-clipboard.writeHTML('<b>Hi</b>')
+clipboard.writeHTML('<b>Hi</b')
 ```
 
 ### `clipboard.readImage([type])`
@@ -197,7 +197,7 @@ Returns `Boolean` - Whether the clipboard supports the specified `format`.
 ```js
 const { clipboard } = require('electron')
 
-const hasFormat = clipboard.has('public/utf8-plain-text')
+const hasFormat = clipboard.has('<p>selection</p>')
 console.log(hasFormat)
 // 'true' or 'false'
 ```

docs/api/command-line-switches.md

@@ -61,12 +61,6 @@ throttling in one window, you can take the hack of
 
 Forces the maximum disk space to be used by the disk cache, in bytes.
 
-### --enable-api-filtering-logging
-
-Enables caller stack logging for the following APIs (filtering events):
-
-* `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
-
 ### --enable-logging[=file]
 
 Prints Chromium's logging to stderr (or a log file).

docs/api/context-bridge.md

@@ -102,8 +102,8 @@ has been included below for completeness:
 | `Boolean` | Simple | ✅ | ✅ | N/A |
 | `Object` | Complex | ✅ | ✅ | Keys must be supported using only "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
 | `Array` | Complex | ✅ | ✅ | Same limitations as the `Object` type |
-| `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context, and any custom properties on the Error object [will be lost](https://github.com/electron/electron/issues/25596) |
-| `Promise` | Complex | ✅ | ✅ | N/A
+| `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context |
+| `Promise` | Complex | ✅ | ✅ | Promises are only proxied if they are the return value or exact parameter.  Promises nested in arrays or objects will be dropped. |
 | `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
 | `Element` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending custom elements will not work. |

docs/api/cookies.md

@@ -99,7 +99,7 @@ the response.
   * `expirationDate` Double (optional) - 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.
-  * `sameSite` String (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `lax`.
+  * `sameSite` String (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `no_restriction`.
 
 Returns `Promise<void>` - A promise which resolves when the cookie has been set
 

docs/api/desktop-capturer.md

@@ -3,40 +3,49 @@
 > Access information about media sources that can be used to capture audio and
 > video from the desktop using the [`navigator.mediaDevices.getUserMedia`] API.
 
-Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)
+Process: [Main](../glossary.md#main-process)
 
 The following example shows how to capture video from a desktop window whose
 title is `Electron`:
 
 ```javascript
-// In the renderer process.
+// In the main process.
 const { desktopCapturer } = require('electron')
 
 desktopCapturer.getSources({ types: ['window', 'screen'] }).then(async sources => {
   for (const source of sources) {
     if (source.name === 'Electron') {
-      try {
-        const stream = await navigator.mediaDevices.getUserMedia({
-          audio: false,
-          video: {
-            mandatory: {
-              chromeMediaSource: 'desktop',
-              chromeMediaSourceId: source.id,
-              minWidth: 1280,
-              maxWidth: 1280,
-              minHeight: 720,
-              maxHeight: 720
-            }
-          }
-        })
-        handleStream(stream)
-      } catch (e) {
-        handleError(e)
-      }
+      mainWindow.webContents.send('SET_SOURCE', source.id)
       return
     }
   }
 })
+```
+
+```javascript
+// In the preload script.
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('SET_SOURCE', async (event, sourceId) => {
+  try {
+    const stream = await navigator.mediaDevices.getUserMedia({
+      audio: false,
+      video: {
+        mandatory: {
+          chromeMediaSource: 'desktop',
+          chromeMediaSourceId: sourceId,
+          minWidth: 1280,
+          maxWidth: 1280,
+          minHeight: 720,
+          maxHeight: 720
+        }
+      }
+    })
+    handleStream(stream)
+  } catch (e) {
+    handleError(e)
+  }
+})
 
 function handleStream (stream) {
   const video = document.querySelector('video')

docs/api/environment-variables.md

@@ -122,7 +122,7 @@ Prints Chromium's internal logging to the console.
 
 Setting this variable is the same as passing `--enable-logging`
 on the command line. For more info, see `--enable-logging` in [command-line
-switches](./command-line-switches.md#--enable-loggingfile).
+switches](./command-line-switches.md#enable-loggingfile).
 
 ### `ELECTRON_LOG_FILE`
 
@@ -130,7 +130,7 @@ Sets the file destination for Chromium's internal logging.
 
 Setting this variable is the same as passing `--log-file`
 on the command line. For more info, see `--log-file` in [command-line
-switches](./command-line-switches.md#--log-filepath).
+switches](./command-line-switches.md#log-filepath).
 
 ### `ELECTRON_DEBUG_DRAG_REGIONS`
 

docs/api/session.md

@@ -903,10 +903,8 @@ setting with the current OS locale.  This setting is persisted across restarts.
 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.
+to host here, the file server must be **case insensitive** you must upload each file twice, once with the case it
+has in the ZIP file and once with the filename as all lower case.
 
 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

docs/api/web-contents.md

@@ -736,8 +736,6 @@ 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.
-
 ```javascript
 const { app, BrowserWindow } = require('electron')
 
@@ -858,15 +856,6 @@ Returns:
 
 Emitted when the renderer process sends a synchronous message via `ipcRenderer.sendSync()`.
 
-#### Event: 'desktop-capturer-get-sources'
-
-Returns:
-
-* `event` Event
-
-Emitted when `desktopCapturer.getSources()` is called in the renderer process.
-Calling `event.preventDefault()` will make it return empty sources.
-
 #### Event: 'preferred-size-changed'
 
 Returns:
@@ -1612,7 +1601,7 @@ app.whenReady().then(() => {
 
 * `options` Object (optional)
   * `mode` String - Opens the devtools with specified dock state, can be
-    `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
+    `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.
   * `activate` Boolean (optional) - Whether to bring the opened devtools window
     to the foreground. The default is `true`.
@@ -1840,7 +1829,7 @@ the cursor when dragging.
 
 #### `contents.savePage(fullPath, saveType)`
 
-* `fullPath` String - The absolute file path.
+* `fullPath` String - The full file path.
 * `saveType` String - Specify the save type.
   * `HTMLOnly` - Save only the HTML of the page.
   * `HTMLComplete` - Save complete-html page.

docs/api/web-frame.md

@@ -5,8 +5,8 @@
 Process: [Renderer](../glossary.md#renderer-process)
 
 `webFrame` export of the Electron module is an instance of the `WebFrame`
-class representing the current frame. Sub-frames can be retrieved by
-certain properties and methods (e.g. `webFrame.firstChild`).
+class representing the top frame of the current `BrowserWindow`. Sub-frames can
+be retrieved by certain properties and methods (e.g. `webFrame.firstChild`).
 
 An example of zooming current page to 200%.
 

docs/api/window-open.md

@@ -64,9 +64,6 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
   `features` will be passed to any registered `webContents`'s
   `did-create-window` event handler in the `options` argument.
 * `frameName` follows the specification of `windowName` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
-* When opening `about:blank`, the child window's `WebPreferences` will be copied
-  from the parent window, and there is no way to override it because Chromium
-  skips browser side navigation in this case.
 
 To customize or cancel the creation of the window, you can optionally set an
 override handler with `webContents.setWindowOpenHandler()` from the main

docs/development/build-instructions-gn.md

@@ -85,37 +85,42 @@ $ gclient sync -f
 
 ## Building
 
-**Set the environment variable for chromium build tools**
-
-On Linux & MacOS
-
 ```sh
 $ cd src
 $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```
 
-On Windows:
+Or on Windows (without the optional argument):
 
 ```sh
 $ cd src
 $ set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
-```
-
-**To generate Testing build config of Electron:**
-
-```sh
 $ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\")"
 ```
 
-**To generate Release build config of Electron:**
+This will generate a build directory `out/Testing` under `src/` with
+the testing build configuration. You can replace `Testing` with another name,
+but it should be a subdirectory of `out`.
+Also you shouldn't have to run `gn gen` again—if you want to change the
+build arguments, you can run `gn args out/Testing` to bring up an editor.
+
+To see the list of available build configuration options, run `gn args
+out/Testing --list`.
+
+**For generating Testing build config of
+Electron:**
 
 ```sh
-$ gn gen out/Release --args="import(\"//electron/build/args/release.gn\")"
+$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```
 
-**Note:** This will generate a `out/Testing` or `out/Release` build directory under `src/` with the testing or release build depending upon the configuration passed above. You can replace `Testing|Release` with another names, but it should be a subdirectory of `out`.
+**For generating Release (aka "non-component" or "static") build config of
+Electron:**
 
-Also you shouldn't have to run `gn gen` again—if you want to change the build arguments, you can run `gn args out/Testing` to bring up an editor. To see the list of available build configuration options, run `gn args out/Testing --list`.
+```sh
+$ gn gen out/Release --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
+```
 
 **To build, run `ninja` with the `electron` target:**
 Nota Bene: This will also take a while and probably heat up your lap.
@@ -151,13 +156,13 @@ $ ./out/Testing/electron
 On linux, first strip the debugging and symbol information:
 
 ```sh
-$ electron/script/strip-binaries.py -d out/Release
+electron/script/strip-binaries.py -d out/Release
 ```
 
 To package the electron build as a distributable zip file:
 
 ```sh
-$ ninja -C out/Release electron:electron_dist_zip
+ninja -C out/Release electron:electron_dist_zip
 ```
 
 ### Cross-compiling

docs/development/setting-up-symbol-server.md

@@ -43,9 +43,8 @@ SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\sym
 
 ## Using the symbol server in Visual Studio
 
-![Tools -> Options](../images/vs-tools-options.png)
-
-![Symbols Settings](../images/vs-options-debugging-symbols.png)
+![Tools -> Options](https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg)
+![Symbols Settings](https://mdn.mozillademos.org/files/2497/2005_options.gif)
 
 ## Troubleshooting: Symbols will not load
 

docs/tutorial/accessibility.md

@@ -1,7 +1,48 @@
 # Accessibility
 
+Making accessible applications is important and we're happy to provide
+functionality to [Devtron][devtron] and [Spectron][spectron] that gives
+developers the opportunity to make their apps better for everyone.
+
+---
+
 Accessibility concerns in Electron applications are similar to those of
-websites because they're both ultimately HTML.
+websites because they're both ultimately HTML. With Electron apps, however,
+you can't use the online resources for accessibility audits because your app
+doesn't have a URL to point the auditor to.
+
+These features bring those auditing tools to your Electron app. You can
+choose to add audits to your tests with Spectron or use them within DevTools
+with Devtron. Read on for a summary of the tools.
+
+## Spectron
+
+In the testing framework Spectron, you can now audit each window and `<webview>`
+tag in your application. For example:
+
+```javascript
+app.client.auditAccessibility().then((audit) => {
+  if (audit.failed) {
+    console.error(audit.message)
+  }
+})
+```
+
+You can read more about this feature in [Spectron's documentation][spectron-a11y].
+
+## Devtron
+
+In Devtron, there is an accessibility tab which will allow you to audit a
+page in your app, sort and filter the results.
+
+![devtron screenshot][devtron-screenshot]
+
+Both of these tools are using the [Accessibility Developer Tools][a11y-devtools]
+library built by Google for Chrome. You can learn more about the accessibility
+audit rules this library uses on that [repository's wiki][a11y-devtools-wiki].
+
+If you know of other great accessibility tools for Electron, add them to the
+accessibility documentation with a pull request.
 
 ## Manually enabling accessibility features
 
@@ -43,6 +84,10 @@ CFStringRef kAXManualAccessibility = CFSTR("AXManualAccessibility");
 }
 ```
 
+[devtron]: https://electronjs.org/devtron
+[devtron-screenshot]: https://cloud.githubusercontent.com/assets/1305617/17156618/9f9bcd72-533f-11e6-880d-389115f40a2a.png
+[spectron]: https://electronjs.org/spectron
+[spectron-a11y]: https://github.com/electron/spectron#accessibility-testing
 [a11y-docs]: https://www.chromium.org/developers/design-documents/accessibility#TOC-How-Chrome-detects-the-presence-of-Assistive-Technology
 [a11y-devtools]: https://github.com/GoogleChrome/accessibility-developer-tools
 [a11y-devtools-wiki]: https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules

docs/tutorial/application-distribution.md

@@ -56,7 +56,7 @@ will then be your distribution to deliver to users.
 
 ### With an app source code archive
 
-Instead of shipping your app by copying all of its source files, you can
+Instead of from 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
 files on platforms like Windows, if you are not already using a bundler such
 as Parcel or Webpack.

docs/tutorial/automated-testing-with-a-custom-driver.md

@@ -0,0 +1,135 @@
+# Automated Testing with a Custom Driver
+
+To write automated tests for your Electron app, you will need a way to "drive" your application. [Spectron](https://electronjs.org/spectron) is a commonly-used solution which lets you emulate user actions via [WebDriver](https://webdriver.io/). However, it's also possible to write your own custom driver using node's builtin IPC-over-STDIO. The benefit of a custom driver is that it tends to require less overhead than Spectron, and lets you expose custom methods to your test suite.
+
+To create a custom driver, we'll use Node.js' [child_process](https://nodejs.org/api/child_process.html) API. The test suite will spawn the Electron process, then establish a simple messaging protocol:
+
+```js
+const childProcess = require('child_process')
+const electronPath = require('electron')
+
+// spawn the process
+const env = { /* ... */ }
+const stdio = ['inherit', 'inherit', 'inherit', 'ipc']
+const appProcess = childProcess.spawn(electronPath, ['./app'], { stdio, env })
+
+// listen for IPC messages from the app
+appProcess.on('message', (msg) => {
+  // ...
+})
+
+// send an IPC message to the app
+appProcess.send({ my: 'message' })
+```
+
+From within the Electron app, you can listen for messages and send replies using the Node.js [process](https://nodejs.org/api/process.html) API:
+
+```js
+// listen for IPC messages from the test suite
+process.on('message', (msg) => {
+  // ...
+})
+
+// send an IPC message to the test suite
+process.send({ my: 'message' })
+```
+
+We can now communicate from the test suite to the Electron app using the `appProcess` object.
+
+For convenience, you may want to wrap `appProcess` in a driver object that provides more high-level functions. Here is an example of how you can do this:
+
+```js
+class TestDriver {
+  constructor ({ path, args, env }) {
+    this.rpcCalls = []
+
+    // start child process
+    env.APP_TEST_DRIVER = 1 // let the app know it should listen for messages
+    this.process = childProcess.spawn(path, args, { stdio: ['inherit', 'inherit', 'inherit', 'ipc'], env })
+
+    // handle rpc responses
+    this.process.on('message', (message) => {
+      // pop the handler
+      const rpcCall = this.rpcCalls[message.msgId]
+      if (!rpcCall) return
+      this.rpcCalls[message.msgId] = null
+      // reject/resolve
+      if (message.reject) rpcCall.reject(message.reject)
+      else rpcCall.resolve(message.resolve)
+    })
+
+    // wait for ready
+    this.isReady = this.rpc('isReady').catch((err) => {
+      console.error('Application failed to start', err)
+      this.stop()
+      process.exit(1)
+    })
+  }
+
+  // simple RPC call
+  // to use: driver.rpc('method', 1, 2, 3).then(...)
+  async rpc (cmd, ...args) {
+    // send rpc request
+    const msgId = this.rpcCalls.length
+    this.process.send({ msgId, cmd, args })
+    return new Promise((resolve, reject) => this.rpcCalls.push({ resolve, reject }))
+  }
+
+  stop () {
+    this.process.kill()
+  }
+}
+```
+
+In the app, you'd need to write a simple handler for the RPC calls:
+
+```js
+const METHODS = {
+  isReady () {
+    // do any setup needed
+    return true
+  }
+  // define your RPC-able methods here
+}
+
+const onMessage = async ({ msgId, cmd, args }) => {
+  let method = METHODS[cmd]
+  if (!method) method = () => new Error('Invalid method: ' + cmd)
+  try {
+    const resolve = await method(...args)
+    process.send({ msgId, resolve })
+  } catch (err) {
+    const reject = {
+      message: err.message,
+      stack: err.stack,
+      name: err.name
+    }
+    process.send({ msgId, reject })
+  }
+}
+
+if (process.env.APP_TEST_DRIVER) {
+  process.on('message', onMessage)
+}
+```
+
+Then, in your test suite, you can use your test-driver as follows:
+
+```js
+const test = require('ava')
+const electronPath = require('electron')
+
+const app = new TestDriver({
+  path: electronPath,
+  args: ['./app'],
+  env: {
+    NODE_ENV: 'test'
+  }
+})
+test.before(async t => {
+  await app.isReady
+})
+test.after.always('cleanup', async t => {
+  await app.stop()
+})
+```

docs/tutorial/automated-testing.md

@@ -1,409 +0,0 @@
-# Automated Testing
-
-Test automation is an efficient way of validating that your application code works as intended.
-While Electron doesn't actively maintain its own testing solution, this guide will go over a couple
-ways you can run end-to-end automated tests on your Electron app.
-
-## Using the WebDriver interface
-
-From [ChromeDriver - WebDriver for Chrome][chrome-driver]:
-
-> WebDriver is an open source tool for automated testing of web apps across many
-> browsers. It provides capabilities for navigating to web pages, user input,
-> JavaScript execution, and more. ChromeDriver is a standalone server which
-> implements WebDriver's wire protocol for Chromium. It is being developed by
-> members of the Chromium and WebDriver teams.
-
-There are a few ways that you can set up testing using WebDriver.
-
-### With WebdriverIO
-
-[WebdriverIO](https://webdriver.io/) (WDIO) is a test automation framework that provides a
-Node.js package for testing with WebDriver. Its ecosystem also includes various plugins
-(e.g. reporter and services) that can help you put together your test setup.
-
-#### Install the testrunner
-
-First you need to run the WebdriverIO starter toolkit in your project root directory:
-
-```sh npm2yarn
-npx wdio . --yes
-```
-
-This installs all necessary packages for you and generates a `wdio.conf.js` configuration file.
-
-#### Connect WDIO to your Electron app
-
-Update the capabilities in your configuration file to point to your Electron app binary:
-
-```javascript title='wdio.conf.js'
-export.config = {
-  // ...
-  capabilities: [{
-    browserName: 'chrome',
-    'goog:chromeOptions': {
-      binary: '/path/to/your/electron/binary', // Path to your Electron binary.
-      args: [/* cli arguments */] // Optional, perhaps 'app=' + /path/to/your/app/
-    }
-  }]
-  // ...
-}
-```
-
-#### Run your tests
-
-To run your tests:
-
-```sh
-$ npx wdio run wdio.conf.js
-```
-
-### With Selenium
-
-[Selenium](https://www.selenium.dev/) is a web automation framework that
-exposes bindings to WebDriver APIs in many languages. Their Node.js bindings
-are available under the `selenium-webdriver` package on NPM.
-
-#### Run a ChromeDriver server
-
-In order to use Selenium with Electron, you need to download the `electron-chromedriver`
-binary, and run it:
-
-```sh npm2yarn
-npm install --save-dev electron-chromedriver
-./node_modules/.bin/chromedriver
-Starting ChromeDriver (v2.10.291558) on port 9515
-Only local connections are allowed.
-```
-
-Remember the port number `9515`, which will be used later.
-
-#### Connect Selenium to ChromeDriver
-
-Next, install Selenium into your project:
-
-```sh npm2yarn
-npm install --save-dev selenium-webdriver
-```
-
-Usage of `selenium-webdriver` with Electron is the same as with
-normal websites, except that you have to manually specify how to connect
-ChromeDriver and where to find the binary of your Electron app:
-
-```js title='test.js'
-const webdriver = require('selenium-webdriver')
-const driver = new webdriver.Builder()
-  // The "9515" is the port opened by ChromeDriver.
-  .usingServer('http://localhost:9515')
-  .withCapabilities({
-    'goog:chromeOptions': {
-      // Here is the path to your Electron binary.
-      binary: '/Path-to-Your-App.app/Contents/MacOS/Electron'
-    }
-  })
-  .forBrowser('chrome') // note: use .forBrowser('electron') for selenium-webdriver <= 3.6.0
-  .build()
-driver.get('http://www.google.com')
-driver.findElement(webdriver.By.name('q')).sendKeys('webdriver')
-driver.findElement(webdriver.By.name('btnG')).click()
-driver.wait(() => {
-  return driver.getTitle().then((title) => {
-    return title === 'webdriver - Google Search'
-  })
-}, 1000)
-driver.quit()
-```
-
-## Using Playwright
-
-[Microsoft Playwright](https://playwright.dev) is an end-to-end testing framework built
-using browser-specific remote debugging protocols, similar to the [Puppeteer] headless
-Node.js API but geared towards end-to-end testing. Playwright has experimental Electron
-support via Electron's support for the [Chrome DevTools Protocol] (CDP).
-
-### Install dependencies
-
-You can install Playwright through your preferred Node.js package manager. The Playwright team
-recommends using the `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` environment variable to avoid
-unnecessary browser downloads when testing an Electron app.
-
-```sh npm2yarn
-PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npm install --save-dev playwright
-```
-
-Playwright also comes with its own test runner, Playwright Test, which is built for end-to-end
-testing. You can also install it as a dev dependency in your project:
-
-```sh npm2yarn
-npm install --save-dev @playwright/test
-```
-
-:::caution Dependencies
-This tutorial was written `playwright@1.16.3` and `@playwright/test@1.16.3`. Check out
-[Playwright's releases][playwright-releases] page to learn about
-changes that might affect the code below.
-:::
-
-:::info Using third-party test runners
-If you're interested in using an alternative test runner (e.g. Jest or Mocha), check out
-Playwright's [Third-Party Test Runner][playwright-test-runners] guide.
-:::
-
-### Write your tests
-
-Playwright launches your app in development mode through the `_electron.launch` API.
-To point this API to your Electron app, you can pass the path to your main process
-entry point (here, it is `main.js`).
-
-```js {5}
-const { _electron: electron } = require('playwright')
-const { test } = require('@playwright/test')
-
-test('launch app', async () => {
-  const electronApp = await electron.launch({ args: ['main.js'] })
-  // close app
-  await electronApp.close()
-})
-```
-
-After that, you will access to an instance of Playwright's `ElectronApp` class. This
-is a powerful class that has access to main process modules for example:
-
-```js {6-11}
-const { _electron: electron } = require('playwright')
-const { test } = require('@playwright/test')
-
-test('get isPackaged', async () => {
-  const electronApp = await electron.launch({ args: ['main.js'] })
-  const isPackaged = await electronApp.evaluate(async ({ app }) => {
-    // This runs in Electron's main process, parameter here is always
-    // the result of the require('electron') in the main app script.
-    return app.isPackaged
-  })
-  console.log(isPackaged) // false (because we're in development mode)
-  // close app
-  await electronApp.close()
-})
-```
-
-It can also create individual [Page][playwright-page] objects from Electron BrowserWindow instances.
-For example, to grab the first BrowserWindow and save a screenshot:
-
-```js {6-7}
-const { _electron: electron } = require('playwright')
-const { test } = require('@playwright/test')
-
-test('save screenshot', async () => {
-  const electronApp = await electron.launch({ args: ['main.js'] })
-  const window = await electronApp.firstWindow()
-  await window.screenshot({ path: 'intro.png' })
-  // close app
-  await electronApp.close()
-})
-```
-
-Putting all this together using the PlayWright Test runner, let's create a `example.spec.js`
-test file with a single test and assertion:
-
-```js title='example.spec.js'
-const { _electron: electron } = require('playwright')
-const { test, expect } = require('@playwright/test')
-
-test('example test', async () => {
-  const electronApp = await electron.launch({ args: ['.'] })
-  const isPackaged = await electronApp.evaluate(async ({ app }) => {
-    // This runs in Electron's main process, parameter here is always
-    // the result of the require('electron') in the main app script.
-    return app.isPackaged;
-  });
-
-  expect(isPackaged).toBe(false);
-
-  // Wait for the first BrowserWindow to open
-  // and return its Page object
-  const window = await electronApp.firstWindow()
-  await window.screenshot({ path: 'intro.png' })
-
-  // close app
-  await electronApp.close()
-});
-```
-
-Then, run Playwright Test using `npx playwright test`. You should see the test pass in your
-console, and have an `intro.png` screenshot on your filesystem.
-
-```console
-☁  $ npx playwright test
-
-Running 1 test using 1 worker
-
-  ✓  example.spec.js:4:1 › example test (1s)
-```
-
-:::info
-Playwright Test will automatically run any files matching the `.*(test|spec)\.(js|ts|mjs)` regex.
-You can customize this match in the [Playwright Test configuration options][playwright-test-config].
-:::
-
-:::tip Further reading
-Check out Playwright's documentation for the full [Electron][playwright-electron]
-and [ElectronApplication][playwright-electronapplication] class APIs.
-:::
-
-## Using a custom test driver
-
-It's also possible to write your own custom driver using Node.js' built-in IPC-over-STDIO.
-Custom test drivers require you to write additional app code, but have lower overhead and let you
-expose custom methods to your test suite.
-
-To create a custom driver, we'll use Node.js' [`child_process`](https://nodejs.org/api/child_process.html) API.
-The test suite will spawn the Electron process, then establish a simple messaging protocol:
-
-```js title='testDriver.js'
-const childProcess = require('child_process')
-const electronPath = require('electron')
-
-// spawn the process
-const env = { /* ... */ }
-const stdio = ['inherit', 'inherit', 'inherit', 'ipc']
-const appProcess = childProcess.spawn(electronPath, ['./app'], { stdio, env })
-
-// listen for IPC messages from the app
-appProcess.on('message', (msg) => {
-  // ...
-})
-
-// send an IPC message to the app
-appProcess.send({ my: 'message' })
-```
-
-From within the Electron app, you can listen for messages and send replies using the Node.js
-[`process`](https://nodejs.org/api/process.html) API:
-
-```js title='main.js'
-// listen for messages from the test suite
-process.on('message', (msg) => {
-  // ...
-})
-
-// send a message to the test suite
-process.send({ my: 'message' })
-```
-
-We can now communicate from the test suite to the Electron app using the `appProcess` object.
-
-For convenience, you may want to wrap `appProcess` in a driver object that provides more
-high-level functions. Here is an example of how you can do this. Let's start by creating
-a `TestDriver` class:
-
-```js title='testDriver.js'
-class TestDriver {
-  constructor ({ path, args, env }) {
-    this.rpcCalls = []
-
-    // start child process
-    env.APP_TEST_DRIVER = 1 // let the app know it should listen for messages
-    this.process = childProcess.spawn(path, args, { stdio: ['inherit', 'inherit', 'inherit', 'ipc'], env })
-
-    // handle rpc responses
-    this.process.on('message', (message) => {
-      // pop the handler
-      const rpcCall = this.rpcCalls[message.msgId]
-      if (!rpcCall) return
-      this.rpcCalls[message.msgId] = null
-      // reject/resolve
-      if (message.reject) rpcCall.reject(message.reject)
-      else rpcCall.resolve(message.resolve)
-    })
-
-    // wait for ready
-    this.isReady = this.rpc('isReady').catch((err) => {
-      console.error('Application failed to start', err)
-      this.stop()
-      process.exit(1)
-    })
-  }
-
-  // simple RPC call
-  // to use: driver.rpc('method', 1, 2, 3).then(...)
-  async rpc (cmd, ...args) {
-    // send rpc request
-    const msgId = this.rpcCalls.length
-    this.process.send({ msgId, cmd, args })
-    return new Promise((resolve, reject) => this.rpcCalls.push({ resolve, reject }))
-  }
-
-  stop () {
-    this.process.kill()
-  }
-}
-
-module.exports = { TestDriver };
-```
-
-In your app code, can then write a simple handler to receive RPC calls:
-
-```js title='main.js'
-const METHODS = {
-  isReady () {
-    // do any setup needed
-    return true
-  }
-  // define your RPC-able methods here
-}
-
-const onMessage = async ({ msgId, cmd, args }) => {
-  let method = METHODS[cmd]
-  if (!method) method = () => new Error('Invalid method: ' + cmd)
-  try {
-    const resolve = await method(...args)
-    process.send({ msgId, resolve })
-  } catch (err) {
-    const reject = {
-      message: err.message,
-      stack: err.stack,
-      name: err.name
-    }
-    process.send({ msgId, reject })
-  }
-}
-
-if (process.env.APP_TEST_DRIVER) {
-  process.on('message', onMessage)
-}
-```
-
-Then, in your test suite, you can use your `TestDriver` class with the test automation
-framework of your choosing. The following example uses
-[`ava`](https://www.npmjs.com/package/ava), but other popular choices like Jest
-or Mocha would work as well:
-
-```js title='test.js'
-const test = require('ava')
-const electronPath = require('electron')
-const { TestDriver } = require('./testDriver')
-
-const app = new TestDriver({
-  path: electronPath,
-  args: ['./app'],
-  env: {
-    NODE_ENV: 'test'
-  }
-})
-test.before(async t => {
-  await app.isReady
-})
-test.after.always('cleanup', async t => {
-  await app.stop()
-})
-```
-
-[chrome-driver]: https://sites.google.com/chromium.org/driver/
-[Puppeteer]: https://github.com/puppeteer/puppeteer
-[playwright-electron]: https://playwright.dev/docs/api/class-electron/
-[playwright-electronapplication]: https://playwright.dev/docs/api/class-electronapplication
-[playwright-page]: https://playwright.dev/docs/api/class-page
-[playwright-releases]: https://github.com/microsoft/playwright/releases
-[playwright-test-config]: https://playwright.dev/docs/api/class-testconfig#test-config-test-match
-[playwright-test-runners]: https://playwright.dev/docs/test-runners/
-[Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/

docs/tutorial/electron-timelines.md

@@ -7,7 +7,7 @@ Special notes:
 * 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 15.0 only will include a special Alpha release. 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 |
 | ------- | ----- | ------- | ------ | ------ | ---- |
@@ -25,5 +25,4 @@ Special notes:
 | 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 | TBD |
+| 16.0.0 | -- | 2021-Sep-23 | 2021-Nov-16 | M96 | TBD |

docs/tutorial/installation.md

@@ -91,7 +91,7 @@ The above configuration will download from URLs such as
 `https://npm.taobao.org/mirrors/electron/8.0.0/electron-v8.0.0-linux-x64.zip`.
 
 If your mirror serves artifacts with different checksums to the official
-Electron release you may have to set `electron_use_remote_checksums=1` to
+Electron release you may have to set `ELECTRON_USE_REMOTE_CHECKSUMS=1` to
 force Electron to use the remote `SHASUMS256.txt` file to verify the checksum
 instead of the embedded checksums.
 

docs/tutorial/introduction.md

@@ -56,4 +56,4 @@ problem. If not, feel free to fill out our bug report template and submit a new
 [comic]: https://www.google.com/googlebooks/chrome/
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues
-[discord]: https://discord.gg/electronjs
+[discord]: https://discord.gg/electron

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-old.gnome.org/notification-spec/
+[notification-spec]: https://developer.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

docs/tutorial/quick-start.md

@@ -119,7 +119,7 @@ of your project.
 
 Before we can create a window for our application, we need to create the content that
 will be loaded into it. In Electron, each window displays web contents that can be loaded
-from either a local HTML file or a remote URL.
+from either from a local HTML file or a remote URL.
 
 For this tutorial, you will be doing the former. Create an `index.html` file in the root
 folder of your project:

docs/tutorial/support.md

@@ -70,10 +70,10 @@ until the maintainers feel the maintenance burden is too high to continue doing
 
 ### Currently supported versions
 
+* 17.x.y
 * 16.x.y
 * 15.x.y
-* 14.x.y
-* 13.x.y
+* 13
 
 ### End-of-life
 

docs/tutorial/using-selenium-and-webdriver.md

@@ -0,0 +1,173 @@
+# Selenium and WebDriver
+
+From [ChromeDriver - WebDriver for Chrome][chrome-driver]:
+
+> WebDriver is an open source tool for automated testing of web apps across many
+> browsers. It provides capabilities for navigating to web pages, user input,
+> JavaScript execution, and more. ChromeDriver is a standalone server which
+> implements WebDriver's wire protocol for Chromium. It is being developed by
+> members of the Chromium and WebDriver teams.
+
+## Setting up Spectron
+
+[Spectron][spectron] is the officially supported ChromeDriver testing framework
+for Electron. It is built on top of [WebdriverIO](https://webdriver.io/) and
+has helpers to access Electron APIs in your tests and bundles ChromeDriver.
+
+```sh
+$ npm install --save-dev spectron
+```
+
+```javascript
+// A simple test to verify a visible window is opened with a title
+const Application = require('spectron').Application
+const assert = require('assert')
+
+const myApp = new Application({
+  path: '/Applications/MyApp.app/Contents/MacOS/MyApp'
+})
+
+const verifyWindowIsVisibleWithTitle = async (app) => {
+  await app.start()
+  try {
+    // Check if the window is visible
+    const isVisible = await app.browserWindow.isVisible()
+    // Verify the window is visible
+    assert.strictEqual(isVisible, true)
+    // Get the window's title
+    const title = await app.client.getTitle()
+    // Verify the window's title
+    assert.strictEqual(title, 'My App')
+  } catch (error) {
+    // Log any failures
+    console.error('Test failed', error.message)
+  }
+  // Stop the application
+  await app.stop()
+}
+
+verifyWindowIsVisibleWithTitle(myApp)
+```
+
+## Setting up with WebDriverJs
+
+[WebDriverJs](https://www.selenium.dev/selenium/docs/api/javascript/index.html) provides
+a Node package for testing with web driver, we will use it as an example.
+
+### 1. Start ChromeDriver
+
+First you need to download the `chromedriver` binary, and run it:
+
+```sh
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver
+Starting ChromeDriver (v2.10.291558) on port 9515
+Only local connections are allowed.
+```
+
+Remember the port number `9515`, which will be used later
+
+### 2. Install WebDriverJS
+
+```sh
+$ npm install selenium-webdriver
+```
+
+### 3. Connect to ChromeDriver
+
+The usage of `selenium-webdriver` with Electron is the same with
+upstream, except that you have to manually specify how to connect
+chrome driver and where to find Electron's binary:
+
+```javascript
+const webdriver = require('selenium-webdriver')
+
+const driver = new webdriver.Builder()
+  // The "9515" is the port opened by chrome driver.
+  .usingServer('http://localhost:9515')
+  .withCapabilities({
+    'goog:chromeOptions': {
+      // Here is the path to your Electron binary.
+      binary: '/Path-to-Your-App.app/Contents/MacOS/Electron'
+    }
+  })
+  .forBrowser('chrome') // note: use .forBrowser('electron') for selenium-webdriver <= 3.6.0
+  .build()
+
+driver.get('http://www.google.com')
+driver.findElement(webdriver.By.name('q')).sendKeys('webdriver')
+driver.findElement(webdriver.By.name('btnG')).click()
+driver.wait(() => {
+  return driver.getTitle().then((title) => {
+    return title === 'webdriver - Google Search'
+  })
+}, 1000)
+
+driver.quit()
+```
+
+## Setting up with WebdriverIO
+
+[WebdriverIO](https://webdriver.io/) provides a Node package for testing with web
+driver.
+
+### 1. Start ChromeDriver
+
+First you need to download the `chromedriver` binary, and run it:
+
+```sh
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515
+Starting ChromeDriver (v2.10.291558) on port 9515
+Only local connections are allowed.
+```
+
+Remember the port number `9515`, which will be used later
+
+### 2. Install WebdriverIO
+
+```sh
+$ npm install webdriverio
+```
+
+### 3. Connect to chrome driver
+
+```javascript
+const webdriverio = require('webdriverio')
+const options = {
+  host: 'localhost', // Use localhost as chrome driver server
+  port: 9515, // "9515" is the port opened by chrome driver.
+  desiredCapabilities: {
+    browserName: 'chrome',
+    'goog:chromeOptions': {
+      binary: '/Path-to-Your-App/electron', // Path to your Electron binary.
+      args: [/* cli arguments */] // Optional, perhaps 'app=' + /path/to/your/app/
+    }
+  }
+}
+
+const client = webdriverio.remote(options)
+
+client
+  .init()
+  .url('http://google.com')
+  .setValue('#q', 'webdriverio')
+  .click('#btnG')
+  .getTitle().then((title) => {
+    console.log('Title was: ' + title)
+  })
+  .end()
+```
+
+## Workflow
+
+To test your application without rebuilding Electron,
+[place](application-distribution.md)
+your app source into Electron's resource directory.
+
+Alternatively, pass an argument to run with your Electron binary that points to
+your app's folder. This eliminates the need to copy-paste your app into
+Electron's resource directory.
+
+[chrome-driver]: https://sites.google.com/a/chromium.org/chromedriver/
+[spectron]: https://electronjs.org/spectron

electron_strings.grdp

@@ -33,23 +33,6 @@
     {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.">

filenames.auto.gni

@@ -141,7 +141,6 @@ auto_filenames = {
     "lib/common/web-view-methods.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
-    "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/inspector.ts",
@@ -223,7 +222,6 @@ auto_filenames = {
     "lib/browser/api/web-contents.ts",
     "lib/browser/api/web-frame-main.ts",
     "lib/browser/default-menu.ts",
-    "lib/browser/desktop-capturer.ts",
     "lib/browser/devtools.ts",
     "lib/browser/guest-view-manager.ts",
     "lib/browser/guest-window-manager.ts",
@@ -270,7 +268,6 @@ auto_filenames = {
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
-    "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/exports/electron.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
@@ -308,7 +305,6 @@ auto_filenames = {
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
-    "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/exports/electron.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",

filenames.gni

@@ -675,6 +675,11 @@ filenames = {
     "shell/utility/electron_content_utility_client.h",
   ]
 
+  lib_sources_nss = [
+    "chromium_src/chrome/browser/certificate_manager_model.cc",
+    "chromium_src/chrome/browser/certificate_manager_model.h",
+  ]
+
   lib_sources_extensions = [
     "shell/browser/extensions/api/i18n/i18n_api.cc",
     "shell/browser/extensions/api/i18n/i18n_api.h",

lib/browser/api/desktop-capturer.ts

@@ -1,5 +1,72 @@
-import { getSourcesImpl } from '@electron/internal/browser/desktop-capturer';
+const { createDesktopCapturer } = process._linkedBinding('electron_browser_desktop_capturer');
 
-export async function getSources (options: Electron.SourcesOptions) {
-  return getSourcesImpl(null, options);
+const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);
+
+let currentlyRunning: {
+  options: ElectronInternal.GetSourcesOptions;
+  getSources: Promise<ElectronInternal.GetSourcesResult[]>;
+}[] = [];
+
+// |options.types| can't be empty and must be an array
+function isValid (options: Electron.SourcesOptions) {
+  const types = options ? options.types : undefined;
+  return Array.isArray(types);
+}
+
+export async function getSources (args: Electron.SourcesOptions) {
+  if (!isValid(args)) throw new Error('Invalid options');
+
+  const captureWindow = args.types.includes('window');
+  const captureScreen = args.types.includes('screen');
+
+  const { thumbnailSize = { width: 150, height: 150 } } = args;
+  const { fetchWindowIcons = false } = args;
+
+  const options = {
+    captureWindow,
+    captureScreen,
+    thumbnailSize,
+    fetchWindowIcons
+  };
+
+  for (const running of currentlyRunning) {
+    if (deepEqual(running.options, options)) {
+      // If a request is currently running for the same options
+      // return that promise
+      return running.getSources;
+    }
+  }
+
+  const getSources = new Promise<ElectronInternal.GetSourcesResult[]>((resolve, reject) => {
+    let capturer: ElectronInternal.DesktopCapturer | null = createDesktopCapturer();
+
+    const stopRunning = () => {
+      if (capturer) {
+        delete capturer._onerror;
+        delete capturer._onfinished;
+        capturer = null;
+      }
+      // Remove from currentlyRunning once we resolve or reject
+      currentlyRunning = currentlyRunning.filter(running => running.options !== options);
+    };
+
+    capturer._onerror = (error: string) => {
+      stopRunning();
+      reject(error);
+    };
+
+    capturer._onfinished = (sources: Electron.DesktopCapturerSource[]) => {
+      stopRunning();
+      resolve(sources);
+    };
+
+    capturer.startHandling(captureWindow, captureScreen, thumbnailSize, fetchWindowIcons);
+  });
+
+  currentlyRunning.push({
+    options,
+    getSources
+  });
+
+  return getSources;
 }

lib/browser/api/web-contents.ts

@@ -669,6 +669,16 @@ WebContents.prototype._init = function () {
         postBody
       };
       windowOpenOverriddenOptions = this._callWindowOpenHandler(event, details);
+      // if attempting to use this API with the deprecated new-window event,
+      // windowOpenOverriddenOptions will always return null. This ensures
+      // short-term backwards compatibility until new-window is removed.
+      const parsedFeatures = parseFeatures(rawFeatures);
+      const overriddenFeatures: BrowserWindowConstructorOptions = {
+        ...parsedFeatures.options,
+        webPreferences: parsedFeatures.webPreferences
+      };
+      windowOpenOverriddenOptions = windowOpenOverriddenOptions || overriddenFeatures;
+
       if (!event.defaultPrevented) {
         const secureOverrideWebPreferences = windowOpenOverriddenOptions ? {
           // Allow setting of backgroundColor as a webPreference even though
@@ -678,19 +688,9 @@ WebContents.prototype._init = function () {
           transparent: windowOpenOverriddenOptions.transparent,
           ...windowOpenOverriddenOptions.webPreferences
         } : undefined;
-        // TODO(zcbenz): The features string is parsed twice: here where it is
-        // passed to C++, and in |makeBrowserWindowOptions| later where it is
-        // not actually used since the WebContents is created here.
-        // We should be able to remove the latter once the |nativeWindowOpen|
-        // option is removed.
-        const { webPreferences: parsedWebPreferences } = parseFeatures(rawFeatures);
-        // Parameters should keep same with |makeBrowserWindowOptions|.
-        const webPreferences = makeWebPreferences({
-          embedder: event.sender,
-          insecureParsedWebPreferences: parsedWebPreferences,
-          secureOverrideWebPreferences
-        });
-        this._setNextChildWebPreferences(webPreferences);
+        this._setNextChildWebPreferences(
+          makeWebPreferences({ embedder: event.sender, secureOverrideWebPreferences })
+        );
       }
     });
 
@@ -738,14 +738,6 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('select-bluetooth-device', (event, devices, callback) => {
-    if (this.listenerCount('select-bluetooth-device') === 1) {
-      // Cancel it if there are no handlers
-      event.preventDefault();
-      callback('');
-    }
-  });
-
   const event = process._linkedBinding('electron_browser_event').createEmpty();
   app.emit('web-contents-created', event, this);
 

lib/browser/desktop-capturer.ts

@@ -1,82 +0,0 @@
-const { createDesktopCapturer } = process._linkedBinding('electron_browser_desktop_capturer');
-
-const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);
-
-let currentlyRunning: {
-  options: ElectronInternal.GetSourcesOptions;
-  getSources: Promise<ElectronInternal.GetSourcesResult[]>;
-}[] = [];
-
-// |options.types| can't be empty and must be an array
-function isValid (options: Electron.SourcesOptions) {
-  const types = options ? options.types : undefined;
-  return Array.isArray(types);
-}
-
-export const getSourcesImpl = (sender: Electron.WebContents | null, args: Electron.SourcesOptions) => {
-  if (!isValid(args)) throw new Error('Invalid options');
-
-  const captureWindow = args.types.includes('window');
-  const captureScreen = args.types.includes('screen');
-
-  const { thumbnailSize = { width: 150, height: 150 } } = args;
-  const { fetchWindowIcons = false } = args;
-
-  const options = {
-    captureWindow,
-    captureScreen,
-    thumbnailSize,
-    fetchWindowIcons
-  };
-
-  for (const running of currentlyRunning) {
-    if (deepEqual(running.options, options)) {
-      // If a request is currently running for the same options
-      // return that promise
-      return running.getSources;
-    }
-  }
-
-  const getSources = new Promise<ElectronInternal.GetSourcesResult[]>((resolve, reject) => {
-    let capturer: ElectronInternal.DesktopCapturer | null = createDesktopCapturer();
-
-    const stopRunning = () => {
-      if (capturer) {
-        delete capturer._onerror;
-        delete capturer._onfinished;
-        capturer = null;
-      }
-      // Remove from currentlyRunning once we resolve or reject
-      currentlyRunning = currentlyRunning.filter(running => running.options !== options);
-      if (sender) {
-        sender.removeListener('destroyed', stopRunning);
-      }
-    };
-
-    capturer._onerror = (error: string) => {
-      stopRunning();
-      reject(error);
-    };
-
-    capturer._onfinished = (sources: Electron.DesktopCapturerSource[]) => {
-      stopRunning();
-      resolve(sources);
-    };
-
-    capturer.startHandling(captureWindow, captureScreen, thumbnailSize, fetchWindowIcons);
-
-    // If the WebContents is destroyed before receiving result, just remove the
-    // reference to emit and the capturer itself so that it never dispatches
-    // back to the renderer
-    if (sender) {
-      sender.once('destroyed', stopRunning);
-    }
-  });
-
-  currentlyRunning.push({
-    options,
-    getSources
-  });
-
-  return getSources;
-};

lib/browser/guest-view-manager.ts

@@ -7,7 +7,7 @@ import { webViewEvents } from '@electron/internal/common/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;
@@ -45,6 +45,7 @@ function makeWebPreferences (embedder: Electron.WebContents, params: Record<stri
     webSecurity: !params.disablewebsecurity,
     enableBlinkFeatures: params.blinkfeatures,
     disableBlinkFeatures: params.disableblinkfeatures,
+    partition: params.partition,
     ...parsedWebPreferences
   };
 
@@ -74,27 +75,26 @@ function makeWebPreferences (embedder: Electron.WebContents, params: Record<stri
   return webPreferences;
 }
 
-function makeLoadURLOptions (params: Record<string, any>) {
-  const opts: Electron.LoadURLOptions = {};
-  if (params.httpreferrer) {
-    opts.httpReferrer = params.httpreferrer;
-  }
-  if (params.useragent) {
-    opts.userAgent = params.useragent;
-  }
-  return opts;
-}
-
 // 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);
+
+  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,9 +108,6 @@ 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;
 
@@ -120,7 +117,14 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
     }
 
     if (params.src) {
-      this.loadURL(params.src, params.opts);
+      const opts: Electron.LoadURLOptions = {};
+      if (params.httpreferrer) {
+        opts.httpReferrer = params.httpreferrer;
+      }
+      if (params.useragent) {
+        opts.userAgent = params.useragent;
+      }
+      this.loadURL(params.src, opts);
     }
     embedder.emit('did-attach-webview', event, guest);
   });
@@ -173,78 +177,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.

lib/browser/guest-window-manager.ts

@@ -217,10 +217,6 @@ function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
       height: 600,
       ...parsedOptions,
       ...overrideOptions,
-      // Note that for |nativeWindowOpen: true| the WebContents is created in
-      // |api::WebContents::WebContentsCreatedWithFullParams|, with prefs
-      // parsed in the |-will-add-new-contents| event.
-      // The |webPreferences| here is only used by |nativeWindowOpen: false|.
       webPreferences: makeWebPreferences({
         embedder,
         insecureParsedWebPreferences: parsedWebPreferences,

lib/browser/rpc-server.ts

@@ -1,30 +1,9 @@
-import { app } from 'electron/main';
-import type { WebContents } from 'electron/main';
 import { clipboard } from 'electron/common';
 import * as fs from 'fs';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as desktopCapturerModule from '@electron/internal/browser/desktop-capturer';
-
-const eventBinding = process._linkedBinding('electron_browser_event');
-
-const emitCustomEvent = function (contents: WebContents, eventName: string, ...args: any[]) {
-  const event = eventBinding.createWithSender(contents);
-
-  app.emit(eventName, event, contents, ...args);
-  contents.emit(eventName, event, ...args);
-
-  return event;
-};
-
-const logStack = function (contents: WebContents, code: string, stack: string) {
-  if (stack) {
-    console.warn(`WebContents (${contents.id}): ${code}`, stack);
-  }
-};
-
 // Implements window.close()
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_WINDOW_CLOSE, function (event) {
   const window = event.sender.getOwnerBrowserWindow();
@@ -62,22 +41,6 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, function (event, me
   return (clipboard as any)[method](...args);
 });
 
-if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  const desktopCapturer = require('@electron/internal/browser/desktop-capturer') as typeof desktopCapturerModule;
-
-  ipcMainInternal.handle(IPC_MESSAGES.DESKTOP_CAPTURER_GET_SOURCES, async function (event, options: Electron.SourcesOptions, stack: string) {
-    logStack(event.sender, 'desktopCapturer.getSources()', stack);
-    const customEvent = emitCustomEvent(event.sender, 'desktop-capturer-get-sources');
-
-    if (customEvent.defaultPrevented) {
-      console.error('Blocked desktopCapturer.getSources()');
-      return [];
-    }
-
-    return await desktopCapturer.getSourcesImpl(event.sender, options);
-  });
-}
-
 const getPreloadScript = async function (preloadPath: string) {
   let preloadSrc = null;
   let preloadError = null;

lib/common/ipc-messages.ts

@@ -8,7 +8,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',
@@ -30,6 +29,4 @@ export const enum IPC_MESSAGES {
   INSPECTOR_CONFIRM = 'INSPECTOR_CONFIRM',
   INSPECTOR_CONTEXT_MENU = 'INSPECTOR_CONTEXT_MENU',
   INSPECTOR_SELECT_FILE = 'INSPECTOR_SELECT_FILE',
-
-  DESKTOP_CAPTURER_GET_SOURCES = 'DESKTOP_CAPTURER_GET_SOURCES',
 }

lib/common/remote/ipc-messages.ts

@@ -0,0 +1,19 @@
+export const enum IPC_MESSAGES {
+  BROWSER_REQUIRE = 'REMOTE_BROWSER_REQUIRE',
+  BROWSER_GET_BUILTIN = 'REMOTE_BROWSER_GET_BUILTIN',
+  BROWSER_GET_GLOBAL = 'REMOTE_BROWSER_GET_GLOBAL',
+  BROWSER_GET_CURRENT_WINDOW = 'REMOTE_BROWSER_GET_CURRENT_WINDOW',
+  BROWSER_GET_CURRENT_WEB_CONTENTS = 'REMOTE_BROWSER_GET_CURRENT_WEB_CONTENTS',
+  BROWSER_CONSTRUCTOR = 'REMOTE_BROWSER_CONSTRUCTOR',
+  BROWSER_FUNCTION_CALL = 'REMOTE_BROWSER_FUNCTION_CALL',
+  BROWSER_MEMBER_CONSTRUCTOR = 'REMOTE_BROWSER_MEMBER_CONSTRUCTOR',
+  BROWSER_MEMBER_CALL = 'REMOTE_BROWSER_MEMBER_CALL',
+  BROWSER_MEMBER_GET = 'REMOTE_BROWSER_MEMBER_GET',
+  BROWSER_MEMBER_SET = 'REMOTE_BROWSER_MEMBER_SET',
+  BROWSER_DEREFERENCE = 'REMOTE_BROWSER_DEREFERENCE',
+  BROWSER_CONTEXT_RELEASE = 'REMOTE_BROWSER_CONTEXT_RELEASE',
+  BROWSER_WRONG_CONTEXT_ERROR = 'REMOTE_BROWSER_WRONG_CONTEXT_ERROR',
+
+  RENDERER_CALLBACK = 'REMOTE_RENDERER_CALLBACK',
+  RENDERER_RELEASE_CALLBACK = 'REMOTE_RENDERER_RELEASE_CALLBACK',
+}

lib/common/reset-search-paths.ts

@@ -2,9 +2,6 @@ import * as path from 'path';
 
 const Module = require('module');
 
-// Clear Node's global search paths.
-Module.globalPaths.length = 0;
-
 // We do not want to allow use of the VM module in the renderer process as
 // it conflicts with Blink's V8::Context internal logic.
 if (process.type === 'renderer') {

lib/renderer/api/desktop-capturer.ts

@@ -1,24 +0,0 @@
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-import deprecate from '@electron/internal/common/api/deprecate';
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
-const { hasSwitch } = process._linkedBinding('electron_common_command_line');
-
-const enableStacks = hasSwitch('enable-api-filtering-logging');
-
-function getCurrentStack () {
-  const target = {};
-  if (enableStacks) {
-    Error.captureStackTrace(target, getCurrentStack);
-  }
-  return (target as any).stack;
-}
-
-let warned = process.noDeprecation;
-export async function getSources (options: Electron.SourcesOptions) {
-  if (!warned) {
-    deprecate.log('The use of \'desktopCapturer.getSources\' in the renderer process is deprecated and will be removed. See https://www.electronjs.org/docs/breaking-changes#removed-desktopcapturergetsources-in-the-renderer for more details.');
-    warned = true;
-  }
-  return await ipcRendererInternal.invoke(IPC_MESSAGES.DESKTOP_CAPTURER_GET_SOURCES, options, getCurrentStack());
-}

lib/renderer/api/module-list.ts

@@ -5,10 +5,3 @@ export const rendererModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'ipcRenderer', loader: () => require('./ipc-renderer') },
   { name: 'webFrame', loader: () => require('./web-frame') }
 ];
-
-if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  rendererModuleList.push({
-    name: 'desktopCapturer',
-    loader: () => require('@electron/internal/renderer/api/desktop-capturer')
-  });
-}

lib/renderer/security-warnings.ts

@@ -77,8 +77,15 @@ const isLocalhost = function () {
  *
  * @returns {boolean} Is a CSP with `unsafe-eval` set?
  */
-const isUnsafeEvalEnabled = () => {
-  return webFrame._isEvalAllowed();
+const isUnsafeEvalEnabled: () => Promise<boolean> = function () {
+  return webFrame.executeJavaScript(`(${(() => {
+    try {
+      eval(window.trustedTypes.emptyScript); // eslint-disable-line no-eval
+    } catch {
+      return false;
+    }
+    return true;
+  }).toString()})()`, false);
 };
 
 const moreInformation = `\nFor more information and help, consult
@@ -167,14 +174,16 @@ const warnAboutDisabledWebSecurity = function (webPreferences?: Electron.WebPref
  * Logs a warning message about unset or insecure CSP
  */
 const warnAboutInsecureCSP = function () {
-  if (!isUnsafeEvalEnabled()) return;
+  isUnsafeEvalEnabled().then((enabled) => {
+    if (!enabled) return;
 
-  const warning = `This renderer process has either no Content Security
-  Policy set or a policy with "unsafe-eval" enabled. This exposes users of
-  this app to unnecessary security risks.\n${moreInformation}`;
+    const warning = `This renderer process has either no Content Security
+    Policy set or a policy with "unsafe-eval" enabled. This exposes users of
+    this app to unnecessary security risks.\n${moreInformation}`;
 
-  console.warn('%cElectron Security Warning (Insecure Content-Security-Policy)',
-    'font-weight: bold;', warning);
+    console.warn('%cElectron Security Warning (Insecure Content-Security-Policy)',
+      'font-weight: bold;', warning);
+  }).catch(() => {});
 };
 
 /**

lib/renderer/web-view/guest-view-internal.ts

@@ -6,7 +6,6 @@ const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_fr
 
 export interface GuestViewDelegate {
   dispatchEvent (eventName: string, props: Record<string, any>): void;
-  reset(): void;
 }
 
 const DEPRECATED_EVENTS: Record<string, string> = {
@@ -14,11 +13,6 @@ const DEPRECATED_EVENTS: Record<string, string> = {
 } as const;
 
 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) {
     if (DEPRECATED_EVENTS[eventName] != null) {
       delegate.dispatchEvent(DEPRECATED_EVENTS[eventName], props);
@@ -29,7 +23,6 @@ export function registerEvents (viewInstanceId: number, delegate: GuestViewDeleg
 }
 
 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}`);
 }
 

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();

lib/renderer/web-view/web-view-impl.ts

@@ -25,6 +25,7 @@ export class WebViewImpl {
   public hasFocus = false
   public internalInstanceId?: number;
   public resizeObserver?: ResizeObserver;
+  public userAgentOverride?: string;
   public viewInstanceId: number
 
   // on* Event handlers.
@@ -179,7 +180,8 @@ export class WebViewImpl {
 
   buildParams () {
     const params: Record<string, any> = {
-      instanceId: this.viewInstanceId
+      instanceId: this.viewInstanceId,
+      userAgentOverride: this.userAgentOverride
     };
 
     for (const [attributeName, attribute] of this.attributes) {
@@ -191,7 +193,7 @@ export class WebViewImpl {
 
   attachGuestInstance (guestInstanceId: number) {
     if (guestInstanceId === -1) {
-      // Do nothing
+      this.dispatchEvent('destroyed');
       return;
     }
 

lib/sandboxed_renderer/api/module-list.ts

@@ -26,10 +26,3 @@ export const moduleList: ElectronInternal.ModuleEntry[] = [
     private: true
   }
 ];
-
-if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  moduleList.push({
-    name: 'desktopCapturer',
-    loader: () => require('@electron/internal/renderer/api/desktop-capturer')
-  });
-}

npm/install.js

@@ -22,8 +22,7 @@ if (isInstalled()) {
 const platform = process.env.npm_config_platform || process.platform;
 let arch = process.env.npm_config_arch || process.arch;
 
-if (platform === 'darwin' && process.platform === 'darwin' && arch === 'x64' &&
-    process.env.npm_config_arch === undefined) {
+if (platform === 'darwin' && process.platform === 'darwin' && arch === 'x64') {
   // When downloading for macOS ON macOS and we think we need x64 we should
   // check if we're running under rosetta and download the arm64 version if appropriate
   try {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "16.0.10",
+  "version": "17.0.0-nightly.20211022",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -33,7 +33,7 @@
     "asar": "^3.1.0",
     "aws-sdk": "^2.727.1",
     "check-for-leaks": "^1.2.1",
-    "colors": "1.4.0",
+    "colors": "^1.4.0",
     "dotenv-safe": "^4.0.4",
     "dugite": "^1.103.0",
     "eslint": "^7.4.0",
@@ -78,7 +78,7 @@
     "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": "python script/run-clang-format.py -r -c chromium_src/ 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",

patches/angle/.patches

@@ -1,3 +0,0 @@
-vangle_change_the_default_vulkan_device_choose_logic.patch
-m98_vulkan_fix_vkcmdresolveimage_extents.patch
-m98_vulkan_fix_vkcmdresolveimage_offsets.patch

patches/angle/m98_vulkan_fix_vkcmdresolveimage_extents.patch

@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Mon, 31 Jan 2022 12:07:43 -0500
-Subject: M98: Vulkan: Fix vkCmdResolveImage extents
-
-The source framebuffer's extents were accidentally used instead of the
-blit area extents.
-
-Bug: chromium:1288020
-Change-Id: I5c6128a191deeea2f972dc7f010be9d40c674ce6
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3457022
-Reviewed-by: Tim Van Patten <timvp@google.com>
-
-diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-index 2eeaa66d2692fe7631591377f32b89cdd90aaf05..4ece465efb683c40027dfee083dd2ed567a0bfc4 100644
---- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-@@ -1464,8 +1464,8 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk,
-     resolveRegion.dstOffset.x                   = params.destOffset[0];
-     resolveRegion.dstOffset.y                   = params.destOffset[1];
-     resolveRegion.dstOffset.z                   = 0;
--    resolveRegion.extent.width                  = params.srcExtents[0];
--    resolveRegion.extent.height                 = params.srcExtents[1];
-+    resolveRegion.extent.width                  = params.blitArea.width;
-+    resolveRegion.extent.height                 = params.blitArea.height;
-     resolveRegion.extent.depth                  = 1;
- 
-     vk::PerfCounters &perfCounters = contextVk->getPerfCounters();
-diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index 18b80da7f6f30f7e8e8e1df2b05c13be6c5b85de..844d38a75ad054c6ed5cd95cb20a49dadbae267b 100644
---- a/src/tests/angle_end2end_tests_expectations.txt
-+++ b/src/tests/angle_end2end_tests_expectations.txt
-@@ -81,6 +81,7 @@
- // the test says.  The test also fails on Intel/Vulkan/Windows.
- 6068 INTEL VULKAN : MultiviewRenderPrimitiveTest.LineLoop/* = SKIP
- 6068 INTEL VULKAN : MultiviewRenderPrimitiveTest.LineStrip/* = SKIP
-+6962 WIN INTEL VULKAN : BlitFramebufferTestES31.PartialResolve/* = SKIP
- 
- // Mac
- 
-diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-index 6fd3f08ef20e315d10c593868d94f6653fa5cdf4..e4d82a511b77ac3b379ec088703d21ce480fafa9 100644
---- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-+++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-@@ -2603,6 +2603,67 @@ TEST_P(BlitFramebufferTest, BlitDepthStencilPixelByPixel)
-     EXPECT_PIXEL_RECT_EQ(64, 0, 128, 1, GLColor::blue);
- }
- 
-+// Regression test for a bug in the Vulkan backend where vkCmdResolveImage was using the src extents
-+// as the resolve area instead of the area passed to glBlitFramebuffer.
-+TEST_P(BlitFramebufferTestES31, PartialResolve)
-+{
-+    constexpr GLint kWidth  = 16;
-+    constexpr GLint kHeight = 32;
-+
-+    // Read framebuffer is multisampled.
-+    GLTexture readTexture;
-+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, readTexture);
-+    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, kWidth, kHeight, GL_TRUE);
-+
-+    GLFramebuffer readFbo;
-+    glBindFramebuffer(GL_FRAMEBUFFER, readFbo);
-+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
-+                           readTexture, 0);
-+    ASSERT_GL_NO_ERROR();
-+    ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
-+
-+    glClearColor(1, 0, 0, 1);
-+    glClear(GL_COLOR_BUFFER_BIT);
-+
-+    // Draw framebuffer is single sampled.  It's bound to a texture with base level the same size as
-+    // the read framebuffer, but it's bound to mip 1.
-+    GLTexture drawTexture;
-+    glBindTexture(GL_TEXTURE_2D, drawTexture);
-+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+                 nullptr);
-+    glGenerateMipmap(GL_TEXTURE_2D);
-+
-+    GLFramebuffer drawFbo;
-+    glBindFramebuffer(GL_FRAMEBUFFER, drawFbo);
-+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, drawTexture, 1);
-+    ASSERT_GL_NO_ERROR();
-+    ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
-+
-+    glClearColor(0, 1, 0, 1);
-+    glClear(GL_COLOR_BUFFER_BIT);
-+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth / 2, kHeight / 2, GLColor::green);
-+
-+    constexpr GLint kResolveX0 = 1;
-+    constexpr GLint kResolveY0 = 2;
-+    constexpr GLint kResolveX1 = 4;
-+    constexpr GLint kResolveY1 = 6;
-+
-+    // Resolve only a portion of the read framebuffer.
-+    glBindFramebuffer(GL_READ_FRAMEBUFFER, readFbo);
-+    glBlitFramebuffer(kResolveX0, kResolveY0, kResolveX1, kResolveY1, kResolveX0, kResolveY0,
-+                      kResolveX1, kResolveY1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-+    ASSERT_GL_NO_ERROR();
-+
-+    glBindFramebuffer(GL_READ_FRAMEBUFFER, drawFbo);
-+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth / 2, kResolveY0, GLColor::green);
-+    EXPECT_PIXEL_RECT_EQ(0, 0, kResolveX0, kHeight / 2, GLColor::green);
-+    EXPECT_PIXEL_RECT_EQ(kResolveX1, 0, kWidth / 2 - kResolveX1, kHeight / 2, GLColor::green);
-+    EXPECT_PIXEL_RECT_EQ(0, kResolveY1, kWidth / 2, kHeight / 2 - kResolveY1, GLColor::green);
-+
-+    EXPECT_PIXEL_RECT_EQ(kResolveX0, kResolveY0, kResolveX1 - kResolveX0, kResolveY1 - kResolveY0,
-+                         GLColor::red);
-+}
-+
- // Test that a draw call to a small FBO followed by a resolve of a large FBO works.
- TEST_P(BlitFramebufferTestES31, DrawToSmallFBOThenResolveLargeFBO)
- {

patches/angle/m98_vulkan_fix_vkcmdresolveimage_offsets.patch

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Mon, 7 Feb 2022 13:46:46 -0500
-Subject: M98: Vulkan: Fix vkCmdResolveImage offsets
-
-glBlitFramebuffer takes identical regions for src and dst when
-resolving.  vkCmdResolveImage should use the clipped area instead of
-using the actual offsets passed to this function.
-
-Bug: chromium:1292537
-Change-Id: If283a8acbca3249b771facbc30bd9f8080a03656
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3457023
-Reviewed-by: Tim Van Patten <timvp@google.com>
-
-diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-index 4ece465efb683c40027dfee083dd2ed567a0bfc4..8099a00084eebcd41603087627a7254a2ef04fd4 100644
---- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-@@ -1456,13 +1456,13 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk,
-     resolveRegion.srcSubresource.mipLevel       = 0;
-     resolveRegion.srcSubresource.baseArrayLayer = params.srcLayer;
-     resolveRegion.srcSubresource.layerCount     = 1;
--    resolveRegion.srcOffset.x                   = params.srcOffset[0];
--    resolveRegion.srcOffset.y                   = params.srcOffset[1];
-+    resolveRegion.srcOffset.x                   = params.blitArea.x;
-+    resolveRegion.srcOffset.y                   = params.blitArea.y;
-     resolveRegion.srcOffset.z                   = 0;
-     resolveRegion.dstSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
-     resolveRegion.dstSubresource.layerCount     = 1;
--    resolveRegion.dstOffset.x                   = params.destOffset[0];
--    resolveRegion.dstOffset.y                   = params.destOffset[1];
-+    resolveRegion.dstOffset.x                   = params.blitArea.x;
-+    resolveRegion.dstOffset.y                   = params.blitArea.y;
-     resolveRegion.dstOffset.z                   = 0;
-     resolveRegion.extent.width                  = params.blitArea.width;
-     resolveRegion.extent.height                 = params.blitArea.height;
-diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index 844d38a75ad054c6ed5cd95cb20a49dadbae267b..5cde8f7170688686cde3e1984a788d64d85d9c2d 100644
---- a/src/tests/angle_end2end_tests_expectations.txt
-+++ b/src/tests/angle_end2end_tests_expectations.txt
-@@ -21,6 +21,8 @@
- 6347 OPENGL : FramebufferTestWithFormatFallback.RGBA4444_BlitCopyTexImage/* = SKIP
- 6347 GLES : FramebufferTestWithFormatFallback.R5G5B5A1_BlitCopyTexImage/* = SKIP
- 6347 GLES : FramebufferTestWithFormatFallback.RGBA4444_BlitCopyTexImage/* = SKIP
-+6989 OPENGL : BlitFramebufferTestES31.OOBResolve/* = SKIP
-+6989 GLES : BlitFramebufferTestES31.OOBResolve/* = SKIP
- 
- // Direct SPIR-V generation.  The following tests pass on some platforms but not others.  Need to investigate.
- 4889 VULKAN : GeometryShaderTest.LayeredFramebufferPreRenderClear2DArrayColor/ES3_1_Vulkan_DirectSPIRVGen = SKIP
-diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-index e4d82a511b77ac3b379ec088703d21ce480fafa9..92559f965137c8a2202b0840e298648c5e8b8740 100644
---- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-+++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
-@@ -2603,6 +2603,55 @@ TEST_P(BlitFramebufferTest, BlitDepthStencilPixelByPixel)
-     EXPECT_PIXEL_RECT_EQ(64, 0, 128, 1, GLColor::blue);
- }
- 
-+// Regression test for a bug in the Vulkan backend where vkCmdResolveImage was used with
-+// out-of-bounds regions.
-+TEST_P(BlitFramebufferTestES31, OOBResolve)
-+{
-+    constexpr GLint kWidth  = 16;
-+    constexpr GLint kHeight = 32;
-+
-+    // Read framebuffer is multisampled.
-+    GLTexture readTexture;
-+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, readTexture);
-+    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, kWidth, kHeight, GL_TRUE);
-+
-+    GLFramebuffer readFbo;
-+    glBindFramebuffer(GL_FRAMEBUFFER, readFbo);
-+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
-+                           readTexture, 0);
-+    ASSERT_GL_NO_ERROR();
-+    ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
-+
-+    glClearColor(1, 0, 0, 1);
-+    glClear(GL_COLOR_BUFFER_BIT);
-+
-+    // Draw framebuffer is single sampled.
-+    GLTexture drawTexture;
-+    glBindTexture(GL_TEXTURE_2D, drawTexture);
-+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+                 nullptr);
-+    glGenerateMipmap(GL_TEXTURE_2D);
-+
-+    GLFramebuffer drawFbo;
-+    glBindFramebuffer(GL_FRAMEBUFFER, drawFbo);
-+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, drawTexture, 0);
-+    ASSERT_GL_NO_ERROR();
-+    ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
-+
-+    glClearColor(0, 1, 0, 1);
-+    glClear(GL_COLOR_BUFFER_BIT);
-+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::green);
-+
-+    // Resolve the read framebuffer, using bounds that are outside the size of the image.
-+    glBindFramebuffer(GL_READ_FRAMEBUFFER, readFbo);
-+    glBlitFramebuffer(-kWidth * 2, -kHeight * 3, kWidth * 11, kHeight * 8, -kWidth * 2,
-+                      -kHeight * 3, kWidth * 11, kHeight * 8, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-+    ASSERT_GL_NO_ERROR();
-+
-+    glBindFramebuffer(GL_READ_FRAMEBUFFER, drawFbo);
-+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::red);
-+}
-+
- // Regression test for a bug in the Vulkan backend where vkCmdResolveImage was using the src extents
- // as the resolve area instead of the area passed to glBlitFramebuffer.
- TEST_P(BlitFramebufferTestES31, PartialResolve)

patches/angle/vangle_change_the_default_vulkan_device_choose_logic.patch

@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peng Huang <penghuang@chromium.org>
-Date: Mon, 25 Oct 2021 15:45:36 -0400
-Subject: VANGLE: change the default vulkan device choose logic
-
-To match the vulkan device choose logic in chrome, ANGLE will choose
-the default device based on the order of (discret GPU > integrated GPU
-> other GPU)
-
-TODO: for long term, ANGLE should provide a way to let chrome specify
-the physical device.
-
-Bug: chromium:1260869
-Change-Id: Id023138485eb65fcc1d2758103d59a4e6cb2a51d
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3242963
-Reviewed-by: Geoff Lang <geofflang@chromium.org>
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-Commit-Queue: Peng Huang <penghuang@chromium.org>
-
-diff --git a/src/common/vulkan/vulkan_icd.cpp b/src/common/vulkan/vulkan_icd.cpp
-index 20da792b2b150c4dd4dffbe4b2b9997f91e921df..ffd19f84a7262d633fa17483fdac6c3ff8f536dd 100644
---- a/src/common/vulkan/vulkan_icd.cpp
-+++ b/src/common/vulkan/vulkan_icd.cpp
-@@ -11,6 +11,7 @@
- #include <functional>
- #include <vector>
- 
-+#include "common/Optional.h"
- #include "common/bitset_utils.h"
- #include "common/debug.h"
- #include "common/system_utils.h"
-@@ -95,8 +96,7 @@ ICDFilterFunc GetFilterForICD(vk::ICD preferredICD)
-             const std::string anglePreferredDevice =
-                 angle::GetEnvironmentVar(kANGLEPreferredDeviceEnv);
-             return [anglePreferredDevice](const VkPhysicalDeviceProperties &deviceProperties) {
--                return (anglePreferredDevice.empty() ||
--                        anglePreferredDevice == deviceProperties.deviceName);
-+                return (anglePreferredDevice == deviceProperties.deviceName);
-             };
-     }
- }
-@@ -269,9 +269,37 @@ void ChoosePhysicalDevice(const std::vector<VkPhysicalDevice> &physicalDevices,
-             return;
-         }
-     }
--    WARN() << "Preferred device ICD not found. Using default physicalDevice instead.";
- 
--    // Fall back to first device.
-+    Optional<VkPhysicalDevice> integratedDevice;
-+    VkPhysicalDeviceProperties integratedDeviceProperties;
-+    for (const VkPhysicalDevice &physicalDevice : physicalDevices)
-+    {
-+        vkGetPhysicalDeviceProperties(physicalDevice, physicalDevicePropertiesOut);
-+        // If discrete GPU exists, uses it by default.
-+        if (physicalDevicePropertiesOut->deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU)
-+        {
-+            *physicalDeviceOut = physicalDevice;
-+            return;
-+        }
-+        if (physicalDevicePropertiesOut->deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU &&
-+            !integratedDevice.valid())
-+        {
-+            integratedDevice           = physicalDevice;
-+            integratedDeviceProperties = *physicalDevicePropertiesOut;
-+            continue;
-+        }
-+    }
-+
-+    // If only integrated GPU exists, use it by default.
-+    if (integratedDevice.valid())
-+    {
-+        *physicalDeviceOut           = integratedDevice.value();
-+        *physicalDevicePropertiesOut = integratedDeviceProperties;
-+        return;
-+    }
-+
-+    WARN() << "Preferred device ICD not found. Using default physicalDevice instead.";
-+    // Fallback to the first device.
-     *physicalDeviceOut = physicalDevices[0];
-     vkGetPhysicalDeviceProperties(*physicalDeviceOut, physicalDevicePropertiesOut);
- }

patches/chromium/.patches

@@ -106,24 +106,6 @@ feat_expose_raw_response_headers_from_urlloader.patch
 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
-mas_gate_private_enterprise_APIs.patch
+mas_gate_private_enterprise_APIs
 load_v8_snapshot_in_browser_process.patch
-fix_patch_out_permissions_checks_in_exclusive_access.patch
-fix_aspect_ratio_with_max_size.patch
-revert_do_not_display_grammar_error_if_there_it_overlaps_with_spell.patch
-fix_crash_when_saving_edited_pdf_files.patch
-m97_unseasoned-pdf_call_pdfviewwebplugin_a11y_methods_asyncly.patch
-merge_m-97_serial_check_for_detached_buffers_when_writing.patch
-handle_potentiallydanglingmarkup_for_cssimagevalue.patch
-use_axnodeid_rather_than_axnode_in_axeventgenerator_tree_events.patch
-fire_iframe_onload_for_cross-origin-initiated_same-document.patch
-m97_webcodecs_various_decodertemplate_shutdown_cleanups.patch
-do_not_select_vulkan_device_based_on_the_passed_in_gpu_info_on_linux.patch
-cherry-pick-e3805f29fed7.patch
-cherry-pick-be50c60b4225.patch
-cherry-pick-0081bb347e67.patch
-m98_fs_fix_fileutil_lifetime_issue.patch
-cleanup_pausablecriptexecutor_usage.patch
-fix_don_t_restore_maximized_windows_when_calling_showinactive.patch

patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Henri Torgemane <henrit@gmail.com>
-Date: Thu, 23 Sep 2021 21:30:33 -0500
-Subject: add ui::ScopedCliboardWriter::WriteUnsafeRawData
-
-This restores some ability to write to the clipboard using raw formats, which
-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
---- 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,
-   }
- }
- 
-+void ScopedClipboardWriter::WriteUnsafeRawData(const std::u16string& format,
-+                                               mojo_base::BigBuffer data) {
-+  static constexpr int kMaxRegisteredFormats = 100;
-+  if (counter_ >= kMaxRegisteredFormats)
-+    return;
-+  counter_++;
-+  platform_representations_.push_back(
-+      {base::UTF16ToUTF8(format), std::move(data)});
-+}
-+
- void ScopedClipboardWriter::Reset() {
-   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
---- 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 {
-   // This is only used to write custom format data.
-   void WriteData(const std::u16string& format, mojo_base::BigBuffer data);
- 
-+  // write raw (non-pickled) data to the clipboard
-+  void WriteUnsafeRawData(const std::u16string& format,
-+                          mojo_base::BigBuffer data);
-+
-   void WriteImage(const SkBitmap& bitmap);
- 
-   // Mark the data to be written as confidential.

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,7 +33,7 @@ index 5a35396df314ab547990a53c90ebb75d337bcc77..537d746e8828089e88a8d42e86d482ee
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5016aa8bcbcc0c8db3e8e42b04ccef3552adda8b..21e92b783a9c9af54fb81174dddbc4a5f954d4da 100644
+index 37e8fdf8adb078c07e561b5e8cef4051ae4cc75f..ee501be37ff597fee5e060c4bebdf0bd6d3e1ae6 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -4471,7 +4471,7 @@ static_library("browser") {
@@ -46,10 +46,10 @@ index 5016aa8bcbcc0c8db3e8e42b04ccef3552adda8b..21e92b783a9c9af54fb81174dddbc4a5
      }
  
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 3eb5f8189665090c95ba3f7c08c34b23062c7bf0..d2ed026101c464a03f7775034a8b2d3cfce8bb45 100644
+index 335c7d208a563870058d6c260f50c12d80d8d66f..4573f9298c9e32a6805b425e12d60823cf020527 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5501,7 +5501,6 @@ test("unit_tests") {
+@@ -5494,7 +5494,6 @@ test("unit_tests") {
      assert(toolkit_views)
      sources += [ "../browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc" ]
      deps += [
@@ -57,7 +57,7 @@ index 3eb5f8189665090c95ba3f7c08c34b23062c7bf0..d2ed026101c464a03f7775034a8b2d3c
        "//chrome/browser:chrome_process_finder",
        "//chrome/browser/safe_browsing/chrome_cleaner",
        "//chrome/browser/safe_browsing/chrome_cleaner:public",
-@@ -5514,6 +5513,12 @@ test("unit_tests") {
+@@ -5507,6 +5506,12 @@ test("unit_tests") {
        "//components/chrome_cleaner/public/proto",
        "//ui/events/devices:test_support",
      ]
@@ -70,7 +70,7 @@ index 3eb5f8189665090c95ba3f7c08c34b23062c7bf0..d2ed026101c464a03f7775034a8b2d3c
    }
  
    # TODO(crbug.com/931218): Ninja cannot handle certain characters appearing
-@@ -6111,7 +6116,6 @@ test("unit_tests") {
+@@ -6104,7 +6109,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -78,7 +78,7 @@ index 3eb5f8189665090c95ba3f7c08c34b23062c7bf0..d2ed026101c464a03f7775034a8b2d3c
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6151,6 +6155,9 @@ test("unit_tests") {
+@@ -6144,6 +6148,9 @@ test("unit_tests") {
        "//ui/native_theme:test_support",
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]

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 551e75bc26a88206e8af9868163cd5818ebc33e1..19d944da98817b253117c6436099ab4dc7250edb 100644
+index 6520b9b7e90aa7a5e007b592294c761ed416e8d8..1c7df171237f441ae13a8b8b0d681d496ee0cc8a 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6505,6 +6505,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6497,6 +6497,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 551e75bc26a88206e8af9868163cd5818ebc33e1..19d944da98817b253117c6436099ab4d
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 818585d3aca6dce4daff03e68f23266ef1c85a9a..d3145c4dc21e6e47915a5b96224972f70b633fda 100644
+index e7e2e3d3163bbd4ab865ae674f450465f9e84ec3..12ac864159be77519ce6f6dc69941fe1fbdd9c35 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3753,6 +3753,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3749,6 +3749,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 818585d3aca6dce4daff03e68f23266ef1c85a9a..d3145c4dc21e6e47915a5b96224972f7
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_id, session_storage_namespace);
  
-@@ -3795,12 +3803,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3791,12 +3799,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  

patches/chromium/cherry-pick-0081bb347e67.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matt Reynolds <mattreynolds@google.com>
-Date: Wed, 19 Jan 2022 21:03:08 +0000
-Subject: gamepad: Return an invalid handle after ReportBadMessage
-
-Bug: 1285449
-Change-Id: I746c539577f7bdf69cbe4212ac380e0c92a5c771
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3373944
-Auto-Submit: Matt Reynolds <mattreynolds@chromium.org>
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: Reilly Grant <reillyg@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#961125}
-
-diff --git a/device/gamepad/gamepad_monitor.cc b/device/gamepad/gamepad_monitor.cc
-index ce8ba1ef7551e52f8ae4d9a112a08308ab2ce51c..28082924e632a895fc5bc4725bc6de3d6ca120ac 100644
---- a/device/gamepad/gamepad_monitor.cc
-+++ b/device/gamepad/gamepad_monitor.cc
-@@ -53,6 +53,8 @@ void GamepadMonitor::GamepadStartPolling(GamepadStartPollingCallback callback) {
-   GamepadService* service = GamepadService::GetInstance();
-   if (!service->ConsumerBecameActive(this)) {
-     mojo::ReportBadMessage("GamepadMonitor::GamepadStartPolling failed");
-+    std::move(callback).Run(base::ReadOnlySharedMemoryRegion());
-+    return;
-   }
-   std::move(callback).Run(service->DuplicateSharedMemoryRegion());
- }

patches/chromium/cherry-pick-be50c60b4225.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ken Rockot <rockot@google.com>
-Date: Wed, 2 Feb 2022 05:45:44 +0000
-Subject: Viz: Fix UAF on context loss
-
-(cherry picked from commit 98d246cabe677e1d8287e4d42ce02825417be9e2)
-
-Fixed: 1250655
-Change-Id: I2898316635d370fa36b94e0ae2564ed357745b2c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3413372
-Auto-Submit: Ken Rockot <rockot@google.com>
-Reviewed-by: Kyle Charbonneau <kylechar@chromium.org>
-Commit-Queue: Kyle Charbonneau <kylechar@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#963012}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3430523
-Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-Commit-Queue: Ken Rockot <rockot@google.com>
-Cr-Commit-Position: refs/branch-heads/4758@{#1050}
-Cr-Branched-From: 4a2cf4baf90326df19c3ee70ff987960d59a386e-refs/heads/main@{#950365}
-
-diff --git a/services/viz/public/cpp/gpu/context_provider_command_buffer.cc b/services/viz/public/cpp/gpu/context_provider_command_buffer.cc
-index a31c10c610000415b5a88a0824eea63b45a435cc..1b323f142d934afea0215dea190efaa197cec554 100644
---- a/services/viz/public/cpp/gpu/context_provider_command_buffer.cc
-+++ b/services/viz/public/cpp/gpu/context_provider_command_buffer.cc
-@@ -478,9 +478,13 @@ const gpu::GpuFeatureInfo& ContextProviderCommandBuffer::GetGpuFeatureInfo()
- void ContextProviderCommandBuffer::OnLostContext() {
-   CheckValidThreadOrLockAcquired();
- 
--  // Ensure |this| isn't destroyed in the middle of OnLostContext() if observers
--  // drop all references to it.
--  scoped_refptr<ContextProviderCommandBuffer> ref(this);
-+  // Observers may drop the last persistent references to `this`, but there may
-+  // be weak references in use further up the stack. This task is posted to
-+  // ensure that destruction is deferred until it's safe.
-+  base::SequencedTaskRunnerHandle::Get()->PostTask(
-+      FROM_HERE,
-+      base::BindOnce([](scoped_refptr<ContextProviderCommandBuffer>) {},
-+                     base::WrapRefCounted(this)));
- 
-   for (auto& observer : observers_)
-     observer.OnContextLost();

patches/chromium/cherry-pick-e3805f29fed7.patch

@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Ellis <kevers@google.com>
-Date: Fri, 11 Feb 2022 01:36:04 +0000
-Subject: Code health cleanup: replacing animations.
-
-Animation::Update performed a synchronous processing of the finish
-microtask to ensure that finished events where dispatched ahead of
-replace events. This step does not align with the spec.  Instead we
-should be queuing the replace event.  Microtasks will be processed in
-the correct order.
-
-Spec link: https://www.w3.org/TR/web-animations-1/#timelines
-
-Change-Id: Ibe7753e792fb6cf905bbe6815a080a8cc51c2803
-
-(cherry picked from commit d4fb69ff0fe343fe8a171014785a88eabfe2b1c2)
-
-Bug: 1290858
-Change-Id: Ibe7753e792fb6cf905bbe6815a080a8cc51c2803
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3414765
-Reviewed-by: Mustaq Ahmed <mustaq@chromium.org>
-Commit-Queue: Kevin Ellis <kevers@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#964223}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3453925
-Reviewed-by: Adrian Taylor <adetaylor@google.com>
-Commit-Queue: Krishna Govind <govind@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4758@{#1134}
-Cr-Branched-From: 4a2cf4baf90326df19c3ee70ff987960d59a386e-refs/heads/main@{#950365}
-
-diff --git a/third_party/blink/renderer/core/animation/animation.cc b/third_party/blink/renderer/core/animation/animation.cc
-index 943d0594b9c2fdcb10f90e3b4e951b8a809e74f3..734e10902292d7d81884af34b562d18a7802135a 100644
---- a/third_party/blink/renderer/core/animation/animation.cc
-+++ b/third_party/blink/renderer/core/animation/animation.cc
-@@ -2275,10 +2275,6 @@ bool Animation::Update(TimingUpdateReason reason) {
- 
-   if (reason == kTimingUpdateForAnimationFrame) {
-     if (idle || CalculateAnimationPlayState() == kFinished) {
--      // TODO(crbug.com/1029348): Per spec, we should have a microtask
--      // checkpoint right after the update cycle. Once this is fixed we should
--      // no longer need to force a synchronous resolution here.
--      AsyncFinishMicrotask();
-       finished_ = true;
-     }
-   }
-diff --git a/third_party/blink/renderer/core/animation/document_animations.cc b/third_party/blink/renderer/core/animation/document_animations.cc
-index 29217ecb96dbdd342e75145c337c189d85c9bca5..681b30bfdcc30db0d1b8904d327f36582c47a197 100644
---- a/third_party/blink/renderer/core/animation/document_animations.cc
-+++ b/third_party/blink/renderer/core/animation/document_animations.cc
-@@ -47,6 +47,7 @@
- #include "third_party/blink/renderer/core/page/page_animator.h"
- #include "third_party/blink/renderer/core/style/computed_style.h"
- #include "third_party/blink/renderer/platform/bindings/microtask.h"
-+#include "third_party/blink/renderer/platform/heap/persistent.h"
- 
- namespace blink {
- 
-@@ -258,10 +259,13 @@ void DocumentAnimations::RemoveReplacedAnimations(
- 
-   // The list of animations for removal is constructed in reverse composite
-   // ordering for efficiency. Flip the ordering to ensure that events are
--  // dispatched in composite order.
-+  // dispatched in composite order.  Queue as a microtask so that the finished
-+  // event is dispatched ahead of the remove event.
-   for (auto it = animations_to_remove.rbegin();
-        it != animations_to_remove.rend(); it++) {
--    (*it)->RemoveReplacedAnimation();
-+    Animation* animation = *it;
-+    Microtask::EnqueueMicrotask(WTF::Bind(&Animation::RemoveReplacedAnimation,
-+                                          WrapWeakPersistent(animation)));
-   }
- }
- 

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 734abbbf3132d245c2c39bbe9b7780acbea196b0..adff416286eaa10a099be83aaf07e56ec323fe3d 100644
 --- a/chrome/browser/resources/cryptotoken/webrequestsender.js
 +++ b/chrome/browser/resources/cryptotoken/webrequestsender.js
-@@ -141,10 +141,11 @@ function tabInForeground(tabId) {
+@@ -134,10 +134,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) {
+@@ -147,9 +148,13 @@ function tabInForeground(tabId) {
          resolve(false);
          return;
        }

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 1e107193f25f1e76c9cf5d6df4241e4975b4f5f2..054166bbc2d8c6fd7bc62712a9765cc521d6d858 100644
+index 1b86dcca8af204416796134938f2c9a448cca8d7..f6ea363c33a0586d427cae208690d6e3b4259fd5 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -448,7 +448,7 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,

patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

@@ -7,7 +7,7 @@ Pending upstream patch, this gives us fuller access to the window.open params
 so that we will be able to decide whether to cancel it or not.
 
 diff --git a/chrome/browser/android/document/document_web_contents_delegate.cc b/chrome/browser/android/document/document_web_contents_delegate.cc
-index 0e90487923c57c0570e73ef0f0e8c5acc2576932..20fece7e761c28d8d13f53de5b5b521a73f4f168 100644
+index 0e90487923c57c0570e73ef0f0e8c5acc2576932..fcdc88233b2277f3b37a2a2b0bdee7d71b721bf8 100644
 --- a/chrome/browser/android/document/document_web_contents_delegate.cc
 +++ b/chrome/browser/android/document/document_web_contents_delegate.cc
 @@ -46,8 +46,7 @@ bool DocumentWebContentsDelegate::IsWebContentsCreationOverridden(
@@ -16,12 +16,12 @@ index 0e90487923c57c0570e73ef0f0e8c5acc2576932..20fece7e761c28d8d13f53de5b5b521a
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    NOTREACHED();
    return true;
  }
 diff --git a/chrome/browser/android/document/document_web_contents_delegate.h b/chrome/browser/android/document/document_web_contents_delegate.h
-index 5b4d70991e19edcdfee731c56251932bf43e535f..4d996e3821410b2325ef85499f8c307c6e043b2a 100644
+index 5b4d70991e19edcdfee731c56251932bf43e535f..fe1977c5e6ce0f5b30e8be529b9efa51785db57f 100644
 --- a/chrome/browser/android/document/document_web_contents_delegate.h
 +++ b/chrome/browser/android/document/document_web_contents_delegate.h
 @@ -41,8 +41,7 @@ class DocumentWebContentsDelegate
@@ -30,12 +30,12 @@ index 5b4d70991e19edcdfee731c56251932bf43e535f..4d996e3821410b2325ef85499f8c307c
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
  };
  
  #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 363a0d6979aaa8fb1047f6e0ed8b4bf58f547c6f..5f155518a179d4556c3993711e688f88e3f04091 100644
+index 363a0d6979aaa8fb1047f6e0ed8b4bf58f547c6f..0a1279bca644158a6a17662eba9404323685b38f 100644
 --- a/chrome/browser/media/offscreen_tab.cc
 +++ b/chrome/browser/media/offscreen_tab.cc
 @@ -284,8 +284,7 @@ bool OffscreenTab::IsWebContentsCreationOverridden(
@@ -44,12 +44,12 @@ index 363a0d6979aaa8fb1047f6e0ed8b4bf58f547c6f..5f155518a179d4556c3993711e688f88
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    // Disallow creating separate WebContentses.  The WebContents implementation
    // 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 c80128b816cc77b95af215384fdc36b2150f95ea..2063233f6f36829e91ba503d0d66fa5cde994cf3 100644
+index c80128b816cc77b95af215384fdc36b2150f95ea..3fe773e671d1c087eaf1303ca60883597c0c3907 100644
 --- a/chrome/browser/media/offscreen_tab.h
 +++ b/chrome/browser/media/offscreen_tab.h
 @@ -107,8 +107,7 @@ class OffscreenTab final : public ProfileObserver,
@@ -58,12 +58,12 @@ index c80128b816cc77b95af215384fdc36b2150f95ea..2063233f6f36829e91ba503d0d66fa5c
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) final;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
    void EnterFullscreenModeForTab(
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
-index e4f3632c84ebe4dcbbc3deb2f49e351c75ec93fd..08227615c2370bf55edfc373a40d9b488d775ba7 100644
+index e4f3632c84ebe4dcbbc3deb2f49e351c75ec93fd..58902fdaf316ad371ddb3e79e6ebc74cbbafc138 100644
 --- a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
 @@ -77,10 +77,9 @@ bool AssistantWebViewImpl::IsWebContentsCreationOverridden(
@@ -72,7 +72,7 @@ index e4f3632c84ebe4dcbbc3deb2f49e351c75ec93fd..08227615c2370bf55edfc373a40d9b48
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    if (params_.suppress_navigation) {
 -    NotifyDidSuppressNavigation(target_url,
 +    NotifyDidSuppressNavigation(params.target_url,
@@ -80,7 +80,7 @@ index e4f3632c84ebe4dcbbc3deb2f49e351c75ec93fd..08227615c2370bf55edfc373a40d9b48
                                  /*from_user_gesture=*/true);
      return true;
 diff --git a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.h b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.h
-index 07014765f33bdddebcc5bc32a2713d6523faf394..b76a6e4f5d79ad53caba3044c1d9d6e6b9e066f8 100644
+index 07014765f33bdddebcc5bc32a2713d6523faf394..f866f69f9c810d89f1a0e9e4952293f66804602a 100644
 --- a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.h
 +++ b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.h
 @@ -48,8 +48,7 @@ class AssistantWebViewImpl : public ash::AssistantWebView,
@@ -89,12 +89,12 @@ index 07014765f33bdddebcc5bc32a2713d6523faf394..b76a6e4f5d79ad53caba3044c1d9d6e6
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
    content::WebContents* OpenURLFromTab(
        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 ba376cca99e6b8b367c6a4cfc9925b940728b9fc..51731a94efdbba6b582a1a317303c26dd7f06c6c 100644
+index ba376cca99e6b8b367c6a4cfc9925b940728b9fc..f1b831507d628d35cc65f697ffc832568fc28193 100644
 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 @@ -72,8 +72,7 @@ class ChromeKeyboardContentsDelegate : public content::WebContentsDelegate,
@@ -103,12 +103,12 @@ index ba376cca99e6b8b367c6a4cfc9925b940728b9fc..51731a94efdbba6b582a1a317303c26d
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override {
-+      const content::mojom::CreateNewWindowParams& params) override {
++      const mojom::CreateNewWindowParams& params) override {
      return true;
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index c764e3607d274b9ec3f645c2b5fc9c8c1e98ad47..9c177080b4aee8ad71dd9a4c438d5a6daec2c25d 100644
+index c764e3607d274b9ec3f645c2b5fc9c8c1e98ad47..1199199a14ad745a2dde2e2a8bfc0a0dd783c23e 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
 @@ -1789,12 +1789,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -117,7 +117,7 @@ index c764e3607d274b9ec3f645c2b5fc9c8c1e98ad47..9c177080b4aee8ad71dd9a4c438d5a6d
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    return window_container_type ==
               content::mojom::WindowContainerType::BACKGROUND &&
           ShouldCreateBackgroundContents(source_site_instance, opener_url,
@@ -127,7 +127,7 @@ index c764e3607d274b9ec3f645c2b5fc9c8c1e98ad47..9c177080b4aee8ad71dd9a4c438d5a6d
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 69911da4fe7b9894f718fac8d59af1dcc9d18593..eeeef53bd967131d77d440cc61ad3acbb07bd9d7 100644
+index 69911da4fe7b9894f718fac8d59af1dcc9d18593..1a5668edcbfee23a12fc3e9b70a54673c99484dd 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
 @@ -813,8 +813,7 @@ class Browser : public TabStripModelObserver,
@@ -136,12 +136,12 @@ index 69911da4fe7b9894f718fac8d59af1dcc9d18593..eeeef53bd967131d77d440cc61ad3acb
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
    content::WebContents* CreateCustomWebContents(
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
-index ff97ac6e97c688d677053a5f01546a4c2d91ff1d..c095be21525d85e3d6c1f4a0c1dda5c8579e1ec3 100644
+index ff97ac6e97c688d677053a5f01546a4c2d91ff1d..1da6a9c32b883a17975e61d60363918251c78ffd 100644
 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
 +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
 @@ -201,8 +201,7 @@ bool PresentationReceiverWindowController::IsWebContentsCreationOverridden(
@@ -150,12 +150,12 @@ index ff97ac6e97c688d677053a5f01546a4c2d91ff1d..c095be21525d85e3d6c1f4a0c1dda5c8
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    // Disallow creating separate WebContentses.  The WebContents implementation
    // uses this to spawn new windows/tabs, which is also not allowed for
    // local presentations.
 diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
-index 45cd02ecf7b7acb107f95656b3fa07a5fca2ea95..953ea8ae44f7f2bd0623591249cb85f9d0eda543 100644
+index 45cd02ecf7b7acb107f95656b3fa07a5fca2ea95..b06ca2dbdd0c21554802ab3b99576b381d0e4ddb 100644
 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
 +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
 @@ -104,8 +104,7 @@ class PresentationReceiverWindowController final
@@ -164,12 +164,12 @@ index 45cd02ecf7b7acb107f95656b3fa07a5fca2ea95..953ea8ae44f7f2bd0623591249cb85f9
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
  
    // The profile used for the presentation.
    Profile* otr_profile_;
 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 9364a722de5183c077a9c50b8c8a48ffa3a0fea6..58d9e6c24d70dbedeb41f0b29ed1cb03a1bdcde3 100644
+index 9364a722de5183c077a9c50b8c8a48ffa3a0fea6..ddde17de38bc5ca904046702a28a88d7c00f18c4 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(
@@ -178,7 +178,7 @@ index 9364a722de5183c077a9c50b8c8a48ffa3a0fea6..58d9e6c24d70dbedeb41f0b29ed1cb03
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    JNIEnv* env = AttachCurrentThread();
    ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
    if (obj.is_null())
@@ -190,7 +190,7 @@ index 9364a722de5183c077a9c50b8c8a48ffa3a0fea6..58d9e6c24d70dbedeb41f0b29ed1cb03
                                                                    java_gurl);
  }
 diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.h b/components/embedder_support/android/delegate/web_contents_delegate_android.h
-index 4b832f4c3a051eefca57909958334631335e03e1..b665a3cac289409280e61f75eb7d7eb83517f603 100644
+index 4b832f4c3a051eefca57909958334631335e03e1..8aed42112d8fad7df813524cf700d8082ad75c47 100644
 --- a/components/embedder_support/android/delegate/web_contents_delegate_android.h
 +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.h
 @@ -78,8 +78,7 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
@@ -199,12 +199,12 @@ index 4b832f4c3a051eefca57909958334631335e03e1..b665a3cac289409280e61f75eb7d7eb8
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
    void CloseContents(content::WebContents* source) override;
    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 53fad64f87a952fd0d7398958288ecde259b57bf..0b8359b6179bf16e58978e5f3e51a911ad3d0a3f 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(
@@ -213,12 +213,12 @@ index 53fad64f87a952fd0d7398958288ecde259b57bf..26f64dabcbee575034e97ada29c7de48
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    // Background pages should not create other webcontents/tabs.
    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 75eff96958b086ebfe7f99adf0d986213074c45b..ae1f59db9569cd65a5ae92a37af19f9e47eee0aa 100644
+index 75eff96958b086ebfe7f99adf0d986213074c45b..83b2c95c1ae46394d0c483dfbe0cd81c73fb8cd2 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.h
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.h
 @@ -64,8 +64,7 @@ class BackgroundLoaderContents : public content::WebContentsDelegate {
@@ -227,15 +227,15 @@ index 75eff96958b086ebfe7f99adf0d986213074c45b..ae1f59db9569cd65a5ae92a37af19f9e
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
  
    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 9d932b3d21dc74ef710d631ab43a348c45da5eb7..e63e11903927e47410201faa01907174d2110e1a 100644
+index 48a8529b01468bc80b75670b057b203e54cd9dbb..d5bf3e57440985826332672116d34426c3d27a83 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3701,8 +3701,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3697,8 +3697,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -330,7 +330,7 @@ index 663322919d45362718399b5265f9dd16acaea894..e4e599c2ee10ed0a650d6d77c6cfdfd6
        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 264846f62b075fd31be93d65b033ad65fb865b90..1325f58e02f7f28fd58d58c3d8317587c4827e19 100644
+index 264846f62b075fd31be93d65b033ad65fb865b90..a00bae25768573878b6c372cf620c9c4ab7666d4 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
 @@ -379,8 +379,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -339,12 +339,12 @@ index 264846f62b075fd31be93d65b033ad65fb865b90..1325f58e02f7f28fd58d58c3d8317587
      const GURL& opener_url,
 -    const std::string& frame_name,
 -    const GURL& target_url) {
-+    const content::mojom::CreateNewWindowParams& params) {
++    const mojom::CreateNewWindowParams& params) {
    // 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 90fe755aa7dddee8c1f129a4e125efba060ce055..7be424f7b49e37f6d67a4d5d4e105dc292a2f816 100644
+index 90fe755aa7dddee8c1f129a4e125efba060ce055..301dd436259ea35377c6a0336789c524fb0ecc54 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
 @@ -247,8 +247,7 @@ class FrameImpl : public fuchsia::web::Frame,
@@ -353,7 +353,7 @@ index 90fe755aa7dddee8c1f129a4e125efba060ce055..7be424f7b49e37f6d67a4d5d4e105dc2
        const GURL& opener_url,
 -      const std::string& frame_name,
 -      const GURL& target_url) override;
-+      const content::mojom::CreateNewWindowParams& params) override;
++      const mojom::CreateNewWindowParams& params) override;
    void WebContentsCreated(content::WebContents* source_contents,
                            int opener_render_process_id,
                            int opener_render_frame_id,

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 9572c236c2db5c23d910354ed9b07cc8ea82cfb1..5016aa8bcbcc0c8db3e8e42b04ccef3552adda8b 100644
+index 1f848e0760118d48a7c00e1125dbda98b42561ab..37e8fdf8adb078c07e561b5e8cef4051ae4cc75f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -6822,6 +6822,7 @@ static_library("browser") {
+@@ -6821,6 +6821,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",

patches/chromium/cleanup_pausablecriptexecutor_usage.patch

@@ -1,138 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dave Tapuska <dtapuska@chromium.org>
-Date: Tue, 8 Feb 2022 15:58:40 +0000
-Subject: Cleanup PausablecriptExecutor usage.
-
-Improve performance of API so we don't have to go from
-WTF::String->WebString->WTF::String for execution.
-
-Ensure the Executor is traced via the PausableScriptExecutor.
-
-BUG=1289384
-
-(cherry picked from commit c8231f9a89460fd8336e6c0d8e10347f52f540ec)
-
-Change-Id: If9badab91222c49c08a983c60132ce71b183e951
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3407654
-Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#963010}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3443262
-Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4758@{#1109}
-Cr-Branched-From: 4a2cf4baf90326df19c3ee70ff987960d59a386e-refs/heads/main@{#950365}
-
-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 81fd3960e132305d9d860b01f79d30493530d074..0de7559b3e4d325678d1729c1a7386248eaec63f 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
-@@ -213,15 +213,16 @@ v8::MaybeLocal<v8::Value> CallMethodOnFrame(LocalFrame* local_frame,
- 
- // A wrapper class used as the callback for JavaScript executed
- // in an isolated world.
--class JavaScriptIsolatedWorldRequest
--    : public GarbageCollected<JavaScriptIsolatedWorldRequest>,
--      public WebScriptExecutionCallback {
-+class JavaScriptIsolatedWorldRequest : public PausableScriptExecutor::Executor,
-+                                       public WebScriptExecutionCallback {
-   using JavaScriptExecuteRequestInIsolatedWorldCallback =
-       mojom::blink::LocalFrame::JavaScriptExecuteRequestInIsolatedWorldCallback;
- 
-  public:
-   JavaScriptIsolatedWorldRequest(
-       LocalFrame* local_frame,
-+      int32_t world_id,
-+      const String& script,
-       bool wants_result,
-       mojom::blink::LocalFrame::JavaScriptExecuteRequestInIsolatedWorldCallback
-           callback);
-@@ -231,27 +232,53 @@ class JavaScriptIsolatedWorldRequest
-       const JavaScriptIsolatedWorldRequest&) = delete;
-   ~JavaScriptIsolatedWorldRequest() override;
- 
--  // WebScriptExecutionCallback:
--  void Completed(const WebVector<v8::Local<v8::Value>>& result) override;
-+  // PausableScriptExecutor::Executor overrides.
-+  Vector<v8::Local<v8::Value>> Execute(LocalDOMWindow*) override;
-+
-+  void Trace(Visitor* visitor) const override;
- 
--  void Trace(Visitor* visitor) const { visitor->Trace(local_frame_); }
-+  // WebScriptExecutionCallback overrides.
-+  void Completed(const WebVector<v8::Local<v8::Value>>& result) override;
- 
-  private:
-   Member<LocalFrame> local_frame_;
-+  int32_t world_id_;
-+  String script_;
-   bool wants_result_;
-   JavaScriptExecuteRequestInIsolatedWorldCallback callback_;
- };
- 
- JavaScriptIsolatedWorldRequest::JavaScriptIsolatedWorldRequest(
-     LocalFrame* local_frame,
-+    int32_t world_id,
-+    const String& script,
-     bool wants_result,
-     JavaScriptExecuteRequestInIsolatedWorldCallback callback)
-     : local_frame_(local_frame),
-+      world_id_(world_id),
-+      script_(script),
-       wants_result_(wants_result),
--      callback_(std::move(callback)) {}
-+      callback_(std::move(callback)) {
-+  DCHECK_GT(world_id, DOMWrapperWorld::kMainWorldId);
-+}
- 
- JavaScriptIsolatedWorldRequest::~JavaScriptIsolatedWorldRequest() = default;
- 
-+void JavaScriptIsolatedWorldRequest::Trace(Visitor* visitor) const {
-+  PausableScriptExecutor::Executor::Trace(visitor);
-+  visitor->Trace(local_frame_);
-+}
-+
-+Vector<v8::Local<v8::Value>> JavaScriptIsolatedWorldRequest::Execute(
-+    LocalDOMWindow* window) {
-+  // Note: An error event in an isolated world will never be dispatched to
-+  // a foreign world.
-+  ClassicScript* classic_script = ClassicScript::CreateUnspecifiedScript(
-+      script_, SanitizeScriptErrors::kDoNotSanitize);
-+  return {classic_script->RunScriptInIsolatedWorldAndReturnValue(window,
-+                                                                 world_id_)};
-+}
-+
- void JavaScriptIsolatedWorldRequest::Completed(
-     const WebVector<v8::Local<v8::Value>>& result) {
-   base::Value value;
-@@ -271,7 +298,6 @@ void JavaScriptIsolatedWorldRequest::Completed(
-     if (new_value)
-       value = base::Value::FromUniquePtrValue(std::move(new_value));
-   }
--
-   std::move(callback_).Run(std::move(value));
- }
- 
-@@ -934,13 +960,16 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
-   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
-   scoped_refptr<DOMWrapperWorld> isolated_world =
-       DOMWrapperWorld::EnsureIsolatedWorld(ToIsolate(frame_), world_id);
--  ScriptSourceCode source_code = ScriptSourceCode(javascript);
--  HeapVector<ScriptSourceCode> sources;
--  sources.Append(&source_code, 1);
--  auto* executor = MakeGarbageCollected<PausableScriptExecutor>(
--      DomWindow(), std::move(isolated_world), sources, false /* user_gesture */,
-+
-+  // This member will be traced as the |executor| on the PausableScriptExector.
-+  auto* execution_request =
-       MakeGarbageCollected<JavaScriptIsolatedWorldRequest>(
--          frame_, wants_result, std::move(callback)));
-+          frame_, world_id, javascript, wants_result, std::move(callback));
-+
-+  auto* executor = MakeGarbageCollected<PausableScriptExecutor>(
-+      DomWindow(), ToScriptState(frame_, *isolated_world),
-+      /*callback=*/execution_request,
-+      /*executor=*/execution_request);
-   executor->Run();
- 
-   script_execution_power_mode_voter_->ResetVoteAfterTimeout(

patches/chromium/desktop_media_list.patch

@@ -52,7 +52,7 @@ index 98cc4e039ba2b5a467175b15650a7b8ef38e8249..f5aea6a5916b9aa56ee7b81a8de97dc4
    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 c899b52ef01d2c9ea16b281a2b7c4d37f175fa36..f752163d4e1951b2f79c7cc1cb4db51c0965472e 100644
+index c899b52ef01d2c9ea16b281a2b7c4d37f175fa36..a5fc476a52215eba33193012629ab1f73d679c88 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
 @@ -16,7 +16,7 @@
@@ -72,15 +72,12 @@ index c899b52ef01d2c9ea16b281a2b7c4d37f175fa36..f752163d4e1951b2f79c7cc1cb4db51c
  const base::Feature kWindowCaptureMacV2{"WindowCaptureMacV2",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
  #endif
-@@ -427,6 +428,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
+@@ -427,6 +428,8 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
          FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
                                    base::Unretained(worker_.get()),
                                    std::move(native_ids), thumbnail_size_));
 +  } else {
-+#if defined(USE_AURA)
-+    pending_native_thumbnail_capture_ = true;
-+#endif
-+    UpdateNativeThumbnailsFinished();
++    OnRefreshComplete();
    }
  }
  

patches/chromium/disable_color_correct_rendering.patch

@@ -241,7 +241,7 @@ index 3a8decde7b5ce9ae3b20041885749e4763b3d311..390af09a9e53ac30c5682746dc40ccd0
      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 2f980b8f92516a4edab3d9363ab76666e1dcfab6..d244ec871c7c86e7da19b5c2892dd42980fb97a3 100644
+index 9353475f0f41ce96c3bc53a5ff69a137900c8142..e52f628f9c80fb2647890f0f77403e278dfebf1f 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -182,6 +182,7 @@

patches/chromium/disable_hidden.patch

@@ -34,7 +34,7 @@ index da1bc9c7e01c6eef07b1066976e7487767d716f2..5d123c6c48b299745f7524ea8927043e
    // |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 c9cbda8362ebdf8594a8234c2ad85cacbb653ead..9505a5bfc0c88762bc00ba26774a906c9115282e 100644
+index 239088813b9fa96e9e9899acee6f02bcb828ecde..7955f2cb725ef4c011bbbce74820d98783d56a0c 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -611,7 +611,7 @@ void RenderWidgetHostViewAura::HideImpl() {

patches/chromium/do_not_select_vulkan_device_based_on_the_passed_in_gpu_info_on_linux.patch

@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peng Huang <penghuang@chromium.org>
-Date: Mon, 25 Oct 2021 21:10:55 +0000
-Subject: Do not select vulkan device based on the passed in gpu_info on Linux
-
-On linux dual GPU setup, we cannot detect the active GPU correctly.
-It causes problems for GL and Vulkan interop. So we would to use
-ANGLE vulkan backend when vulkan is enabled. So we can choose the same
-GPU for both vulkan and GL. So for this CL, we will not create vulkan
-device based on passed in gpu_info anymore, instead GPU device will be
-selected by the order of
-(discrete GPU > integrated GPU > virtual GPU > CPU simulated GPU).
-And we will use the same logic in ANGLE vulkan backend as well.
-
-Bug: 1260869
-Change-Id: I6fb79a4e6ce1710e4809cd63a0f7738955a8e2d2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3242785
-Commit-Queue: Peng Huang <penghuang@chromium.org>
-Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
-Auto-Submit: Peng Huang <penghuang@chromium.org>
-Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#934696}
-
-diff --git a/gpu/vulkan/vulkan_device_queue.cc b/gpu/vulkan/vulkan_device_queue.cc
-index e4fe73f613dfe27b2ac6ccd7d31448e0f16ff459..22abed4db134647699d5622c4b92c3a861274f7c 100644
---- a/gpu/vulkan/vulkan_device_queue.cc
-+++ b/gpu/vulkan/vulkan_device_queue.cc
-@@ -11,6 +11,7 @@
- 
- #include "base/logging.h"
- #include "base/strings/stringprintf.h"
-+#include "build/build_config.h"
- #include "gpu/config/gpu_info.h"  // nogncheck
- #include "gpu/config/vulkan_info.h"
- #include "gpu/vulkan/vulkan_command_pool.h"
-@@ -77,11 +78,15 @@ bool VulkanDeviceQueue::Initialize(
-     if (device_properties.apiVersion < info.used_api_version)
-       continue;
- 
-+      // In dual-CPU cases, we cannot detect the active GPU correctly on Linux,
-+      // so don't select GPU device based on the |gpu_info|.
-+#if !defined(OS_LINUX)
-     // If gpu_info is provided, the device should match it.
-     if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
-                      device_properties.deviceID != gpu_info->gpu.device_id)) {
-       continue;
-     }
-+#endif
- 
-     if (device_properties.deviceType < 0 ||
-         device_properties.deviceType > VK_PHYSICAL_DEVICE_TYPE_CPU) {
-@@ -112,7 +117,7 @@ bool VulkanDeviceQueue::Initialize(
-         break;
-       }
-     }
--    
-+
-     if (!found)
-       continue;
- 

patches/chromium/feat_add_data_parameter_to_processsingleton.patch

@@ -61,10 +61,10 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446
  #if defined(OS_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 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efedd488afbc 100644
+index 727333dd6abec99643e31bc77ed2cc8f3d5a0a0b..e5361397f78636816507355e7db6a9e55e6ed234 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -626,6 +626,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -567,6 +567,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -72,7 +72,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
                       SocketReader* reader);
  
   private:
-@@ -680,13 +681,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -621,13 +622,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -91,7 +91,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
      // Send back "ACK" message to prevent the client process from starting up.
      reader->FinishWithACK(kACKToken, base::size(kACKToken) - 1);
    } else {
-@@ -734,7 +738,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -675,7 +679,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
@@ -101,7 +101,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
    const size_t kMinMessageLength = base::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -764,10 +769,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -705,10 +710,25 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -110,16 +110,13 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
 +  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) {
++  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);
++        reinterpret_cast<const uint8_t*>(tokens[2 + num_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.
@@ -131,7 +128,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -796,8 +819,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -737,8 +757,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -142,7 +139,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -914,7 +939,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -855,7 +877,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -152,7 +149,7 @@ index 3dffe87e6a561826e7f90bce9727d830ce1c99be..495ca6c58970cdd3c19946cc1507efed
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -924,11 +950,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -865,11 +888,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();

patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch

@@ -103,10 +103,10 @@ index cea1fb864ab46b4b0eabf1db11a0392d6cd575c1..df033f65d50b088778268827e506963a
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 136427ff144f7ce23674f2b18e7deac5f5a5c8dd..94212b48f0a31de898f351c824b289c8c8e4dfad 100644
+index 502003e72febe3fda800a8fd028fcfe29b876685..5b4193082d69cb9c0f904df9a9781b02bb3d2369 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -526,6 +526,7 @@ URLLoader::URLLoader(
+@@ -497,6 +497,7 @@ URLLoader::URLLoader(
        peer_closed_handle_watcher_(FROM_HERE,
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
@@ -114,7 +114,7 @@ index 136427ff144f7ce23674f2b18e7deac5f5a5c8dd..94212b48f0a31de898f351c824b289c8
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -669,7 +670,7 @@ URLLoader::URLLoader(
+@@ -640,7 +641,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 136427ff144f7ce23674f2b18e7deac5f5a5c8dd..94212b48f0a31de898f351c824b289c8
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1299,6 +1300,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1269,6 +1270,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());
@@ -144,10 +144,10 @@ index 136427ff144f7ce23674f2b18e7deac5f5a5c8dd..94212b48f0a31de898f351c824b289c8
    // Parse and remove the Trust Tokens response headers, if any are expected,
    // potentially failing the request if an error occurs.
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index f40ab2d8823e0b7f71b9ea7932d258022518e632..a36ab764380d542b060979763d20dbf65e1925b5 100644
+index d7f278d52db72d18fb779cf409ce8d70c9e32a17..d7e168a184df19d429db2cdc1db40651cb136d68 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -497,6 +497,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -472,6 +472,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  

patches/chromium/fire_iframe_onload_for_cross-origin-initiated_same-document.patch

@@ -1,191 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nate Chapin <japhet@chromium.org>
-Date: Thu, 14 Oct 2021 20:24:32 +0000
-Subject: Fire iframe onload for cross-origin-initiated same-document
- navigations
-
-A cross-origin initiator can check whether or not onload fired to
-guess the url of a target frame. Always firing onload makes it
-appear to be a cross-document navigation, even when it wasn't.
-
-Bug: 1248444
-Change-Id: I79249cb441f61ac6cab65ab9e5dd4a44b291bc4a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3193885
-Commit-Queue: Nate Chapin <japhet@chromium.org>
-Reviewed-by: Rakina Zata Amni <rakina@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#931681}
-
-diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
-index aa1b3ca0c8a877f4de5b819bdc52d335e6bc21c0..da83bd3077306c13e9536a61812434a190de6e5f 100644
---- a/third_party/blink/renderer/core/loader/document_loader.cc
-+++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -1398,7 +1398,25 @@ void DocumentLoader::CommitSameDocumentNavigationInternal(
- 
-   initial_scroll_state_.was_scrolled_by_user = false;
- 
--  frame_->GetDocument()->CheckCompleted();
-+  if (frame_->GetDocument()->LoadEventStillNeeded()) {
-+    frame_->GetDocument()->CheckCompleted();
-+  } else if (frame_->Owner() && initiator_origin &&
-+             !initiator_origin->CanAccess(
-+                 frame_->DomWindow()->GetSecurityOrigin()) &&
-+             frame_->Tree()
-+                 .Parent()
-+                 ->GetSecurityContext()
-+                 ->GetSecurityOrigin()) {
-+    // If this same-document navigation was initiated by a cross-origin iframe
-+    // and is cross-origin to its parent, fire onload on the owner iframe.
-+    // Normally, the owner iframe's onload fires if and only if the window's
-+    // onload fires (i.e., when a navigation to a different document completes).
-+    // However, a cross-origin initiator can use the presence or absence of a
-+    // load event to detect whether the navigation was same- or cross-document,
-+    // and can therefore try to guess the url of a cross-origin iframe. Fire the
-+    // iframe's onload to prevent this technique. https://crbug.com/1251790
-+    frame_->Owner()->DispatchLoad();
-+  }
- 
-   // If the item sequence number didn't change, there's no need to trigger
-   // popstate, restore scroll positions, or scroll to fragments for this
-diff --git a/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async-expected.txt b/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async-expected.txt
-index 850c54970953c62eae282e177949f9082f22a03c..09122d9c3f39f042116d197276420cc1841c5ea8 100644
---- a/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async-expected.txt
-+++ b/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async-expected.txt
-@@ -1,4 +1,6 @@
-+ALERT: iframe onload fired
- ALERT: PASS: url fragment is changing asynchronously
- ALERT: PASS: scheduled postMessage() before hashchange triggered.
-+ALERT: iframe onload fired
- ALERT: PASS: hashchange triggered after postMessage().
--This tests that cross-origin fragment navigations are asynchronous. It does so by scheduling a postMessage before scheduling the navigation. If the navigation is synchronous, the internals API will be able to report the presence of an url fragment immediately.
-+This tests that cross-origin-initiated fragment navigations are asynchronous and always fire the load event at their embedding iframe element if it's cross-origin. It does so by scheduling a postMessage before scheduling the navigation. If the navigation is synchronous, the internals API will be able to report the presence of an url fragment immediately.
-diff --git a/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async.html b/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async.html
-index 3d74de086c1a7f8a5fedff72d7c6bb970fca57ed..a1fc3bc87ccd2319f2dff3c5d8729a1a62875ec8 100644
---- a/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async.html
-+++ b/third_party/blink/web_tests/http/tests/navigation/cross-origin-fragment-navigation-is-async.html
-@@ -1,48 +1,51 @@
- <!DOCTYPE html>
- <html>
--<head>
--    <script>
--        if (window.testRunner) {
--            testRunner.dumpAsText();
--            testRunner.waitUntilDone();
--        }
-+<body>
-+<script>
-+if (window.testRunner) {
-+    testRunner.dumpAsText();
-+    testRunner.waitUntilDone();
-+}
- 
--        function testFragmentNavigation() {
--            window.postMessage("postmessage", "*");
--            document.querySelector('iframe').src = "http://localhost:8000/navigation/resources/postmessage-on-hashchange.html#anchor1";
--            if (window.internals) {
--                if (internals.doesWindowHaveUrlFragment(document.querySelector('iframe').contentWindow))
--                    alert("FAIL: url fragment should change asynchronously");
--                else
--                    alert("PASS: url fragment is changing asynchronously");
--            }
--        }
-+window.onload = function() {
-+    window.postMessage("postmessage", "*");
-+    document.querySelector('iframe').src = "http://localhost:8000/navigation/resources/postmessage-on-hashchange.html#anchor1";
-+    if (window.internals) {
-+        if (internals.doesWindowHaveUrlFragment(document.querySelector('iframe').contentWindow))
-+            alert("FAIL: url fragment should change asynchronously");
-+        else
-+            alert("PASS: url fragment is changing asynchronously");
-+    }
-+}
- 
--        var receivedScheduledPostMessage = false;
--        var receivedHashchangeMessage = false;
--        window.addEventListener('message', function (e) {
--            if (e.data === 'postmessage') {
--                receivedScheduledPostMessage = true;
--                if (receivedHashchangeMessage)
--                    alert('FAIL: hashchange already triggered!');
--                else
--                    alert('PASS: scheduled postMessage() before hashchange triggered.');
--            } else {
--                receivedHashchangeMessage = true;
--                if (receivedScheduledPostMessage)
--                    alert('PASS: hashchange triggered after postMessage().');
--                else
--                    alert('FAIL: hashchange triggered before postMessage().');
--                testRunner.notifyDone();
--            }
--        });
--    </script>
--</head>
--<body>
--    <p>This tests that cross-origin fragment navigations are asynchronous. It does
--    so by scheduling a postMessage before scheduling the navigation. If the
--    navigation is synchronous, the internals API will be able to report the presence
--    of an url fragment immediately.</p>
--    <iframe src="http://localhost:8000/navigation/resources/postmessage-on-hashchange.html" onload='testFragmentNavigation()'></iframe>
-+var receivedScheduledPostMessage = false;
-+var receivedHashchangeMessage = false;
-+window.addEventListener('message', function (e) {
-+    if (e.data === 'postmessage') {
-+        receivedScheduledPostMessage = true;
-+        if (receivedHashchangeMessage)
-+            alert('FAIL: hashchange already triggered!');
-+        else
-+            alert('PASS: scheduled postMessage() before hashchange triggered.');
-+    } else {
-+        receivedHashchangeMessage = true;
-+        if (receivedScheduledPostMessage)
-+            alert('PASS: hashchange triggered after postMessage().');
-+        else
-+            alert('FAIL: hashchange triggered before postMessage().');
-+        testRunner.notifyDone();
-+    }
-+});
-+
-+function onloadFired() {
-+    alert("iframe onload fired");
-+}
-+</script>
-+<p>This tests that cross-origin-initiated fragment navigations are asynchronous
-+and always fire the load event at their embedding iframe element if it's cross-origin. It does
-+so by scheduling a postMessage before scheduling the navigation. If the
-+navigation is synchronous, the internals API will be able to report the presence
-+of an url fragment immediately.</p>
-+<iframe src="http://localhost:8000/navigation/resources/postmessage-on-hashchange.html" onload="onloadFired()"></iframe>
- </body>
- </html>
-diff --git a/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync-expected.txt b/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync-expected.txt
-index c1c1143026cad5cfe51829a8c34d61c01a63ffbf..5a6ccc855e14417df8039f18dba7aa0474ff552d 100644
---- a/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync-expected.txt
-+++ b/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync-expected.txt
-@@ -1,3 +1,4 @@
-+ALERT: iframe onload fired
- ALERT: PASS: url fragment has changed synchronously
- ALERT: PASS: scheduled postMessage() before hashchange triggered.
- ALERT: PASS: hashchange triggered after postMessage().
-diff --git a/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync.html b/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync.html
-index 0ffe3cc8759e8e0ff4df7cad66c93cd5e2cbbe69..2cb9143bfce9a28d8803b49cf6afa7403554cdf4 100644
---- a/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync.html
-+++ b/third_party/blink/web_tests/http/tests/navigation/same-origin-fragment-navigation-is-sync.html
-@@ -36,6 +36,11 @@
-                 testRunner.notifyDone();
-             }
-         });
-+
-+    function onloadFired() {
-+        alert("iframe onload fired");
-+        testFragmentNavigation();
-+    }
-     </script>
- </head>
- <body>
-@@ -43,6 +48,6 @@
-     so by scheduling a postMessage before scheduling the navigation. If the
-     navigation is synchronous, the internals API will be able to report the presence
-     of an url fragment immediately.</p>
--    <iframe src="http://127.0.0.1:8000/navigation/resources/postmessage-on-hashchange.html" onload='testFragmentNavigation()'></iframe>
-+    <iframe src="http://127.0.0.1:8000/navigation/resources/postmessage-on-hashchange.html" onload='onloadFired()'></iframe>
- </body>
- </html>

patches/chromium/fix_aspect_ratio_with_max_size.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cezary Kulakowski <cezary@openfin.co>
-Date: Tue, 11 May 2021 11:14:06 +0200
-Subject: fix: fix aspect ratio when max width/height is set
-
-Add the native frame border size to the minimum and maximum size if
-the view reports its size as the client size. It allows to enlarge
-window to proper values when aspect ratio and max width/height are
-set. It also fixes DCHECK which was triggered when user tried to
-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 a235cab941ec583a8dc9cb5e4105c2d7baae02df..f7c1232b0893c366aeeb77e6df0bbd275b6f7bd4 100644
---- a/ui/views/win/hwnd_message_handler.cc
-+++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3569,6 +3569,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);
-+  // Add the native frame border size to the minimum and maximum size if the
-+  // view reports its size as the client size.
-+  if (delegate_->WidgetSizeIsClientSize()) {
-+    RECT client_rect, rect;
-+    GetClientRect(hwnd(), &client_rect);
-+    GetWindowRect(hwnd(), &rect);
-+    CR_DEFLATE_RECT(&rect, &client_rect);
-+    min_window_size.Enlarge(rect.right - rect.left,
-+                            rect.bottom - rect.top);
-+    // Either axis may be zero, so enlarge them independently.
-+    if (max_window_size.width())
-+      max_window_size.Enlarge(rect.right - rect.left, 0);
-+    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);
- }

patches/chromium/fix_crash_when_saving_edited_pdf_files.patch

@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 17 Jan 2022 23:47:54 +0100
-Subject: fix: crash when saving edited PDF files
-
-This commit fixes a crash that persists any time a user attempts to
-download an edited PDF. This was happening because the logic flow for
-downloading of any edited PDF triggers a call to
-chrome.fileSystem.chooseEntry, which we do not support and which
-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 64308b73b70940187451f0475e4717def9f89cce..1888061bb7a5a6ae778d701aa554191288f20c87 100644
---- a/chrome/browser/resources/pdf/pdf_viewer.js
-+++ b/chrome/browser/resources/pdf/pdf_viewer.js
-@@ -976,25 +976,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
-       dataArray = [result.dataToSave];
-     }
- 
-+    const a = document.createElement('a');
-+    a.download = this.attachments_[index].name;
-     const blob = new Blob(dataArray);
--    const fileName = this.attachments_[index].name;
--    chrome.fileSystem.chooseEntry(
--        {type: 'saveFile', suggestedName: fileName}, entry => {
--          if (chrome.runtime.lastError) {
--            if (chrome.runtime.lastError.message !== 'User cancelled') {
--              console.error(
--                  'chrome.fileSystem.chooseEntry failed: ' +
--                  chrome.runtime.lastError.message);
--            }
--            return;
--          }
--          entry.createWriter(writer => {
--            writer.write(blob);
--            // Unblock closing the window now that the user has saved
--            // successfully.
--            chrome.mimeHandlerPrivate.setShowBeforeUnloadDialog(false);
--          });
--        });
-+    a.href = URL.createObjectURL(blob);
-+    a.click();
-+    URL.revokeObjectURL(a.href);
-   }
- 
-   /**
-@@ -1122,29 +1109,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
-       fileName = fileName + '.pdf';
-     }
- 
--    chrome.fileSystem.chooseEntry(
--        {
--          type: 'saveFile',
--          accepts: [{description: '*.pdf', extensions: ['pdf']}],
--          suggestedName: fileName
--        },
--        entry => {
--          if (chrome.runtime.lastError) {
--            if (chrome.runtime.lastError.message !== 'User cancelled') {
--              console.error(
--                  'chrome.fileSystem.chooseEntry failed: ' +
--                  chrome.runtime.lastError.message);
--            }
--            return;
--          }
--          entry.createWriter(writer => {
--            writer.write(
--                new Blob([result.dataToSave], {type: 'application/pdf'}));
--            // Unblock closing the window now that the user has saved
--            // successfully.
--            chrome.mimeHandlerPrivate.setShowBeforeUnloadDialog(false);
--          });
--        });
-+    const a = document.createElement('a');
-+    a.download = fileName;
-+    const blob = new Blob([result.dataToSave], {type: 'application/pdf'});
-+    a.href = URL.createObjectURL(blob);
-+    a.click();
-+    URL.revokeObjectURL(a.href);
- 
-     // <if expr="enable_ink">
-     // Saving in Annotation mode is destructive: crbug.com/919364

patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch

@@ -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 f7c1232b0893c366aeeb77e6df0bbd275b6f7bd4..ef01843018cfada041330c3ed75d9d55c3225049 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:

patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch

@@ -8,29 +8,27 @@ 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 289f4c08e16fd13ca4b28229549ac634313da70f..48e8fcaec2a7a4e09f9f1c99d2f2a1b4cc9c75a3 100644
+index 6c5272ad70d7e01ad663b884716efdf77deead08..af0b2fe1e7b03cb8f7249f5a964b1a0f4c72d53d 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1773,7 +1773,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1765,7 +1765,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+ 
+   // Called when the base::ScopedClosureRunner returned by
    // IncrementCapturerCount() is destructed.
-   void DecrementCapturerCount(bool stay_hidden,
-                               bool stay_awake,
--                              bool is_activity = true);
-+                              bool is_activity = true) override;
+-  void DecrementCapturerCount(bool stay_hidden, bool stay_awake);
++  void DecrementCapturerCount(bool stay_hidden, bool stay_awake) override;
  
    // 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 6a761f9f127c3965b06f9667d173c3091330c19c..2514246b66b7fc1174c9f90017d26799db260319 100644
+index 8840d078a341bda1abc79c1f9ee72b2cc07f06d6..5c5b3e7760c9ac67b24b66cd1ce51b5a705c5dd6 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -666,6 +666,10 @@ class WebContents : public PageNavigator,
-       bool stay_awake,
-       bool is_activity = true) WARN_UNUSED_RESULT = 0;
+@@ -662,6 +662,8 @@ class WebContents : public PageNavigator,
+       bool stay_hidden,
+       bool stay_awake) WARN_UNUSED_RESULT = 0;
  
-+  virtual void DecrementCapturerCount(bool stay_hidden,
-+                                      bool stay_awake,
-+                                      bool is_activity = true) = 0;
++  virtual void DecrementCapturerCount(bool stay_hidden, bool stay_awake) = 0;
 +
    // Getter for the capture handle, which allows a captured application to
    // opt-in to exposing information to its capturer(s).

patches/chromium/fix_media_key_usage_with_globalshortcuts.patch

@@ -59,45 +59,67 @@ index 554930bc33d87ee88a9bcc5f0cf17cef09c27ef0..8df4f91d3db453afb9f73bcaeb82c919
    // 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 5938f75742b793868638e693a9a8c8dc686dfc46..1263d679a5174beb960265989c370dd4a58ae7b4 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(
-                                CanActiveMediaSessionControllerReceiveEvents();
- 
-   // Tell the underlying MediaKeysListener to listen for the key.
--  if (should_start_watching && media_keys_listener_ &&
-+  if (
-+#if defined(OS_MAC)
-+      !media_key_handling_enabled_ &&
-+#endif  // defined(OS_MAC)
-+      should_start_watching &&
-+      media_keys_listener_ &&
-       !media_keys_listener_->StartWatchingMediaKey(key_code)) {
-     return false;
-   }
-@@ -232,18 +237,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+@@ -231,18 +231,24 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+       media::AudioManager::GetGlobalAppName());
  #endif
  
-   if (system_media_controls_) {
-+    // This is required for proper functioning of MediaMetadata.
-     system_media_controls_->AddObserver(this);
-     system_media_controls_notifier_ =
-         std::make_unique<SystemMediaControlsNotifier>(
-             system_media_controls_.get());
+-  if (system_media_controls_) {
+-    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 is required for proper functioning of MediaMetadata.
++  system_media_controls_->AddObserver(this);
++  system_media_controls_notifier_ =
++      std::make_unique<SystemMediaControlsNotifier>(
++          system_media_controls_.get());
++
++  // Directly listen for media key keypresses when using GlobalShortcuts.
++#if defined(OS_MACOS)
++  auto scope = media_key_handling_enabled_ ?
++    ui::MediaKeysListener::Scope::kGlobal :
++    ui::MediaKeysListener::Scope::kGlobalRequiresAccessibility;
+     media_keys_listener_ = ui::MediaKeysListener::Create(
 -        this, ui::MediaKeysListener::Scope::kGlobal);
 -    DCHECK(media_keys_listener_);
-   }
- 
-+  // Directly listen for media key keypresses when using GlobalShortcuts.
+-  }
++      this, scope);
++#else
 +  media_keys_listener_ = ui::MediaKeysListener::Create(
 +    this, ui::MediaKeysListener::Scope::kGlobal);
++#endif
 +  DCHECK(media_keys_listener_);
-+
+ 
    EnsureAuxiliaryServices();
  }
+diff --git a/ui/base/accelerators/media_keys_listener.h b/ui/base/accelerators/media_keys_listener.h
+index c2b03328c0e508995bdc135031500783f500ceba..1b6b14dc2999c99445cef6ffc04d49a7c1728a54 100644
+--- a/ui/base/accelerators/media_keys_listener.h
++++ b/ui/base/accelerators/media_keys_listener.h
+@@ -20,6 +20,7 @@ class Accelerator;
+ class COMPONENT_EXPORT(UI_BASE) MediaKeysListener {
+  public:
+   enum class Scope {
++    kGlobalRequiresAccessibility, // Listener works whenever application in focus or not but requires accessibility permissions on macOS
+     kGlobal,   // Listener works whenever application in focus or not.
+     kFocused,  // Listener only works whan application has focus.
+   };
+diff --git a/ui/base/accelerators/media_keys_listener_win.cc b/ui/base/accelerators/media_keys_listener_win.cc
+index 6c63a88cbb13cfcc9a8ba652554839275ae1ee04..1643eafc094dce77e4ba8752cd02e1ae6c488b56 100644
+--- a/ui/base/accelerators/media_keys_listener_win.cc
++++ b/ui/base/accelerators/media_keys_listener_win.cc
+@@ -13,7 +13,7 @@ std::unique_ptr<MediaKeysListener> MediaKeysListener::Create(
+     MediaKeysListener::Scope scope) {
+   DCHECK(delegate);
  
+-  if (scope == Scope::kGlobal) {
++  if (scope == Scope::kGlobal || scope == Scope::kGlobalRequiresAccessibility) {
+     // We should never have more than one global media keys listener.
+     if (!GlobalMediaKeysListenerWin::has_instance())
+       return std::make_unique<GlobalMediaKeysListenerWin>(delegate);

patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch

@@ -1,51 +0,0 @@
-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
-
-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
-
-diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index e9c8a4a4bb7334682ceeec05b3a3e872de0192ab..861307591f3721c398c454126cb5a9be9a5e9764 100644
---- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-@@ -368,13 +368,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.
--  if (!exclusive_access_manager()
--           ->context()
--           ->GetProfile()
--           ->GetPrefs()
--           ->GetBoolean(prefs::kFullscreenAllowed)) {
-+  auto* profile = exclusive_access_manager()->context()->GetProfile();
-+  if (!profile || !profile->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed))
-     return;
--  }
- #endif
- 
-   toggled_into_fullscreen_ = true;
-@@ -387,6 +383,7 @@ void FullscreenController::EnterFullscreenModeInternal(
-       url = extension_caused_fullscreen_;
-   }
- 
-+#if 0
-   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.
-@@ -400,6 +397,7 @@ void FullscreenController::EnterFullscreenModeInternal(
-       display_id = display::kInvalidDisplayId;
-     }
-   }
-+#endif
- 
-   if (option == BROWSER)
-     base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));

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 d4a74c24605e1fc4e723f7252052cd123a8303b9..54772fce1a4204f545cecdd0e51c5a62b41bb14d 100644
+index 8d4a43dc12b06f5a39129acb5477a02844e74366..4d45e8ddeb90383dd7fe1e941c5868a72822cbe9 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3078,6 +3078,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3070,6 +3070,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  

patches/chromium/handle_potentiallydanglingmarkup_for_cssimagevalue.patch

@@ -1,135 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rune Lillesveen <futhark@chromium.org>
-Date: Fri, 15 Oct 2021 14:33:17 +0000
-Subject: Handle PotentiallyDanglingMarkup() for CSSImageValue
-
-The flag was lost in the KURL -> String -> KURL conversions. Store the
-flag on CSSImageValue and always re-resolve from the original relative
-url before fetching when that flag is set. The blocking happens in
-BaseFetchContext::CanRequestInternal().
-
-Bug: 1039885
-Change-Id: Ia5777739a0ee0bee591163873926d19e0ea014bf
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3226142
-Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
-Reviewed-by: Mike West <mkwst@chromium.org>
-Commit-Queue: Rune Lillesveen <futhark@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#932004}
-
-diff --git a/third_party/blink/renderer/core/css/build.gni b/third_party/blink/renderer/core/css/build.gni
-index 58b924f732185d95efe6a9438d1f34aebcab377c..3ea66ffca1dd4a0b86c6951ba8e3b2b03139e0c4 100644
---- a/third_party/blink/renderer/core/css/build.gni
-+++ b/third_party/blink/renderer/core/css/build.gni
-@@ -645,6 +645,7 @@ blink_core_tests_css = [
-   "css_font_family_webkit_prefix_test.cc",
-   "css_gradient_value_test.cc",
-   "css_id_selector_value_test.cc",
-+  "css_image_value_test.cc",
-   "css_invalid_variable_value_test.cc",
-   "css_light_dark_value_pair_test.cc",
-   "css_math_expression_node_test.cc",
-diff --git a/third_party/blink/renderer/core/css/css_image_value.cc b/third_party/blink/renderer/core/css/css_image_value.cc
-index 81fe3aa1175a31d5c6f3611ec6bd2a27f71e900d..732b48f787d782779e5fea8bf60a55ca3f7fe95d 100644
---- a/third_party/blink/renderer/core/css/css_image_value.cc
-+++ b/third_party/blink/renderer/core/css/css_image_value.cc
-@@ -51,7 +51,8 @@ CSSImageValue::CSSImageValue(const AtomicString& raw_value,
-       absolute_url_(url.GetString()),
-       cached_image_(image),
-       origin_clean_(origin_clean),
--      is_ad_related_(is_ad_related) {}
-+      is_ad_related_(is_ad_related),
-+      potentially_dangling_markup_(url.PotentiallyDanglingMarkup()) {}
- 
- CSSImageValue::~CSSImageValue() = default;
- 
-@@ -59,7 +60,17 @@ FetchParameters CSSImageValue::PrepareFetch(
-     const Document& document,
-     FetchParameters::ImageRequestBehavior image_request_behavior,
-     CrossOriginAttributeValue cross_origin) const {
--  ResourceRequest resource_request(absolute_url_);
-+  // The PotentiallyDanglingMarkup() flag is lost when storing the absolute url
-+  // as a string from which the KURL is constructed here.
-+  // The url passed into the constructor had the PotentiallyDanglingMarkup flag
-+  // set. That information needs to be passed on to the fetch code to block such
-+  // resources from loading.
-+  KURL request_url = potentially_dangling_markup_
-+                         ? document.CompleteURL(relative_url_)
-+                         : KURL(absolute_url_);
-+  SECURITY_CHECK(request_url.PotentiallyDanglingMarkup() ==
-+                 potentially_dangling_markup_);
-+  ResourceRequest resource_request(request_url);
-   resource_request.SetReferrerPolicy(
-       ReferrerUtils::MojoReferrerPolicyResolveDefault(
-           referrer_.referrer_policy));
-diff --git a/third_party/blink/renderer/core/css/css_image_value.h b/third_party/blink/renderer/core/css/css_image_value.h
-index fca1d73c764412d2014bfd1fe4775937794c9e2d..f414195f4a543fb3f47c1fef3799161d13495507 100644
---- a/third_party/blink/renderer/core/css/css_image_value.h
-+++ b/third_party/blink/renderer/core/css/css_image_value.h
-@@ -102,6 +102,11 @@ class CORE_EXPORT CSSImageValue : public CSSValue {
- 
-   // Whether this was created by an ad-related CSSParserContext.
-   const bool is_ad_related_;
-+
-+  // The url passed into the constructor had the PotentiallyDanglingMarkup flag
-+  // set. That information needs to be passed on to the fetch code to block such
-+  // resources from loading.
-+  const bool potentially_dangling_markup_;
- };
- 
- template <>
-diff --git a/third_party/blink/renderer/core/css/css_image_value_test.cc b/third_party/blink/renderer/core/css/css_image_value_test.cc
-new file mode 100644
-index 0000000000000000000000000000000000000000..83415bd586e3187287dcb020ddafe4c7f8671a61
---- /dev/null
-+++ b/third_party/blink/renderer/core/css/css_image_value_test.cc
-@@ -0,0 +1,50 @@
-+// Copyright 2021 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.
-+
-+#include "third_party/blink/renderer/core/css/css_image_value.h"
-+
-+#include "testing/gtest/include/gtest/gtest.h"
-+#include "third_party/blink/renderer/core/dom/document.h"
-+#include "third_party/blink/renderer/core/dom/element.h"
-+#include "third_party/blink/renderer/core/dom/node_computed_style.h"
-+#include "third_party/blink/renderer/core/loader/resource/image_resource_content.h"
-+#include "third_party/blink/renderer/core/style/computed_style.h"
-+#include "third_party/blink/renderer/core/testing/sim/sim_request.h"
-+#include "third_party/blink/renderer/core/testing/sim/sim_test.h"
-+#include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
-+
-+namespace blink {
-+
-+class CSSImageValueTest : public SimTest {};
-+
-+TEST_F(CSSImageValueTest, BlockPotentiallyDanglingMarkup) {
-+  SimRequest main_resource("https://example.com", "text/html");
-+
-+  LoadURL("https://example.com");
-+
-+  main_resource.Complete(R"HTML(
-+    <!doctype html>
-+    <table id="t1" background="ht
-+    tps://example.com/y<ay?foo"><td>XXX</td></table>
-+    <table id="t2" background="ht
-+    tps://example.com/y<ay?bar#boo"><td>XXX</td></table>
-+  )HTML");
-+
-+  test::RunPendingTasks();
-+  Compositor().BeginFrame();
-+
-+  auto* t1 = GetDocument().getElementById("t1");
-+  ImageResourceContent* content1 =
-+      t1->ComputedStyleRef().BackgroundLayers().GetImage()->CachedImage();
-+  ASSERT_TRUE(content1);
-+  EXPECT_TRUE(content1->ErrorOccurred());
-+
-+  auto* t2 = GetDocument().getElementById("t2");
-+  ImageResourceContent* content2 =
-+      t2->ComputedStyleRef().BackgroundLayers().GetImage()->CachedImage();
-+  ASSERT_TRUE(content2);
-+  EXPECT_TRUE(content2->ErrorOccurred());
-+}
-+
-+}  // namespace blink

patches/chromium/m97_unseasoned-pdf_call_pdfviewwebplugin_a11y_methods_asyncly.patch

@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Hosseinian <dhoss@chromium.org>
-Date: Wed, 8 Dec 2021 00:32:35 +0000
-Subject: Call PdfViewWebPlugin a11y methods asyncly
-
-Calling a11y methods asyncly protects against the self-deletions they
-may cause. The a11y methods call
-content::RenderAccessibility::GenerateAXID() underneath, which may
-cause a relayout which causes the PdfViewWebPlugin to be deleted.
-
-Isolating the calls in posted tasks is a clean way to protect against
-continuing control flow in the object after it is deleted.
-
-(cherry picked from commit 6d9638366ae0f60f8d2db41857fcbc738c2514d4)
-
-Bug: 1274376
-Change-Id: Iffd610a95199826fea56d7f23cb8e344657631d3
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3313692
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#948105}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3319376
-Auto-Submit: Daniel Hosseinian <dhoss@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4692@{#799}
-Cr-Branched-From: 038cd96142d384c0d2238973f1cb277725a62eba-refs/heads/main@{#938553}
-
-diff --git a/pdf/pdf_view_web_plugin.cc b/pdf/pdf_view_web_plugin.cc
-index 29f922ed74379e2d2327a896e4c8149692590de8..193ac2e1b3fed341ce460e736c107652369f87fd 100644
---- a/pdf/pdf_view_web_plugin.cc
-+++ b/pdf/pdf_view_web_plugin.cc
-@@ -802,9 +802,9 @@ void PdfViewWebPlugin::SetFormFieldInFocus(bool in_focus) {
- 
- void PdfViewWebPlugin::SetAccessibilityDocInfo(
-     const AccessibilityDocInfo& doc_info) {
--  if (!pdf_accessibility_data_handler_)
--    return;
--  pdf_accessibility_data_handler_->SetAccessibilityDocInfo(doc_info);
-+  base::ThreadTaskRunnerHandle::Get()->PostTask(
-+      FROM_HERE, base::BindOnce(&PdfViewWebPlugin::OnSetAccessibilityDocInfo,
-+                                weak_factory_.GetWeakPtr(), doc_info));
- }
- 
- void PdfViewWebPlugin::SetAccessibilityPageInfo(
-@@ -812,16 +812,15 @@ void PdfViewWebPlugin::SetAccessibilityPageInfo(
-     std::vector<AccessibilityTextRunInfo> text_runs,
-     std::vector<AccessibilityCharInfo> chars,
-     AccessibilityPageObjects page_objects) {
--  if (!pdf_accessibility_data_handler_)
--    return;
--  pdf_accessibility_data_handler_->SetAccessibilityPageInfo(
--      page_info, text_runs, chars, page_objects);
-+  base::ThreadTaskRunnerHandle::Get()->PostTask(
-+      FROM_HERE, base::BindOnce(&PdfViewWebPlugin::OnSetAccessibilityPageInfo,
-+                                weak_factory_.GetWeakPtr(),
-+                                std::move(page_info), std::move(text_runs),
-+                                std::move(chars), std::move(page_objects)));
- }
- 
- void PdfViewWebPlugin::SetAccessibilityViewportInfo(
-     const AccessibilityViewportInfo& viewport_info) {
--  // The accessibility tree cannot be updated within the scope of
--  // `UpdateGeometry`.
-   base::ThreadTaskRunnerHandle::Get()->PostTask(
-       FROM_HERE,
-       base::BindOnce(&PdfViewWebPlugin::OnSetAccessibilityViewportInfo,
-@@ -1009,11 +1008,32 @@ void PdfViewWebPlugin::OnInvokePrintDialog(int32_t /*result*/) {
-   client_->Print(Container()->GetElement());
- }
- 
-+void PdfViewWebPlugin::OnSetAccessibilityDocInfo(
-+    AccessibilityDocInfo doc_info) {
-+  if (!pdf_accessibility_data_handler_)
-+    return;
-+  pdf_accessibility_data_handler_->SetAccessibilityDocInfo(doc_info);
-+  // `this` may be deleted. Don't do anything else.
-+}
-+
-+void PdfViewWebPlugin::OnSetAccessibilityPageInfo(
-+    AccessibilityPageInfo page_info,
-+    std::vector<AccessibilityTextRunInfo> text_runs,
-+    std::vector<AccessibilityCharInfo> chars,
-+    AccessibilityPageObjects page_objects) {
-+  if (!pdf_accessibility_data_handler_)
-+    return;
-+  pdf_accessibility_data_handler_->SetAccessibilityPageInfo(
-+      page_info, text_runs, chars, page_objects);
-+  // `this` may be deleted. Don't do anything else.
-+}
-+
- void PdfViewWebPlugin::OnSetAccessibilityViewportInfo(
--    const AccessibilityViewportInfo& viewport_info) {
-+    AccessibilityViewportInfo viewport_info) {
-   if (!pdf_accessibility_data_handler_)
-     return;
-   pdf_accessibility_data_handler_->SetAccessibilityViewportInfo(viewport_info);
-+  // `this` may be deleted. Don't do anything else.
- }
- 
- pdf::mojom::PdfService* PdfViewWebPlugin::GetPdfService() {
-diff --git a/pdf/pdf_view_web_plugin.h b/pdf/pdf_view_web_plugin.h
-index f0c182f948ded59474e73bb03b89a3364d0b399e..f3eb489f6dc6553a67ab783814b111e2a64213fa 100644
---- a/pdf/pdf_view_web_plugin.h
-+++ b/pdf/pdf_view_web_plugin.h
-@@ -330,10 +330,21 @@ class PdfViewWebPlugin final : public PdfViewPluginBase,
-   // the plugin are moved off the main thread.
-   void OnInvokePrintDialog(int32_t /*result*/);
- 
--  // Callback to set the viewport information in accessibility tree
-+  // Callback to set the document information in the accessibility tree
-   // asynchronously.
--  void OnSetAccessibilityViewportInfo(
--      const AccessibilityViewportInfo& viewport_info);
-+  void OnSetAccessibilityDocInfo(AccessibilityDocInfo doc_info);
-+
-+  // Callback to set the page information in the accessibility tree
-+  // asynchronously.
-+  void OnSetAccessibilityPageInfo(
-+      AccessibilityPageInfo page_info,
-+      std::vector<AccessibilityTextRunInfo> text_runs,
-+      std::vector<AccessibilityCharInfo> chars,
-+      AccessibilityPageObjects page_objects);
-+
-+  // Callback to set the viewport information in the accessibility tree
-+  // asynchronously.
-+  void OnSetAccessibilityViewportInfo(AccessibilityViewportInfo viewport_info);
- 
-   // May be null in unit tests.
-   pdf::mojom::PdfService* GetPdfService();

patches/chromium/m97_webcodecs_various_decodertemplate_shutdown_cleanups.patch

@@ -1,107 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chris Cunningham <chcunningham@chromium.org>
-Date: Tue, 30 Nov 2021 20:53:26 +0000
-Subject: Various DecoderTemplate shutdown cleanups
-
-1. Use DeleteSoon() when destroying the |decoder_| to avoid destructing
-   in error conditions where it's callback (OnDecodeDone()) is actively
-   executing.
-
-2. Call Shutdown() from ContextDestroyed() to invoke full reset
-   algorithm and tidily clean up all state.
-
-(cherry picked from commit b5e609d4e7a296fa8c2d50f1373e9f3a50003995)
-
-Bug: 1267426
-Change-Id: I927d8a3bd245b3f833e73c74103cbaacf6d73406
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3277273
-Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
-Auto-Submit: Chrome Cunningham <chcunningham@chromium.org>
-Reviewed-by: Dan Sanders <sandersd@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#941390}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3308537
-Commit-Queue: Dan Sanders <sandersd@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4692@{#599}
-Cr-Branched-From: 038cd96142d384c0d2238973f1cb277725a62eba-refs/heads/main@{#938553}
-
-diff --git a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
-index 7bc6b575584d4ef0e59508bf6ef170b12ec86534..736799dca31a3c7c71ffc84e60ae24cb3dbb1082 100644
---- a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
-+++ b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
-@@ -79,8 +79,10 @@ DecoderTemplate<Traits>::DecoderTemplate(ScriptState* script_state,
-   ExecutionContext* context = GetExecutionContext();
-   DCHECK(context);
- 
--  logger_ = std::make_unique<CodecLogger>(
--      context, context->GetTaskRunner(TaskType::kInternalMedia));
-+  main_thread_task_runner_ =
-+      context->GetTaskRunner(TaskType::kInternalMediaRealTime);
-+
-+  logger_ = std::make_unique<CodecLogger>(context, main_thread_task_runner_);
- 
-   logger_->log()->SetProperty<media::MediaLogProperty::kFrameUrl>(
-       context->Url().GetString().Ascii());
-@@ -506,8 +508,10 @@ void DecoderTemplate<Traits>::Shutdown(DOMException* exception) {
-   // Prevent any further logging from being reported.
-   logger_->Neuter();
- 
--  // Clear decoding and JS-visible queue state.
--  decoder_.reset();
-+  // Clear decoding and JS-visible queue state. Use DeleteSoon() to avoid
-+  // deleting decoder_ when its callback (e.g. OnDecodeDone()) may be below us
-+  // in the stack.
-+  main_thread_task_runner_->DeleteSoon(FROM_HERE, std::move(decoder_));
- 
-   if (pending_request_) {
-     // This request was added as part of calling ResetAlgorithm above. However,
-@@ -724,9 +728,8 @@ void DecoderTemplate<Traits>::TraceQueueSizes() const {
- 
- template <typename Traits>
- void DecoderTemplate<Traits>::ContextDestroyed() {
--  state_ = V8CodecState(V8CodecState::Enum::kClosed);
--  logger_->Neuter();
--  decoder_.reset();
-+  // Deallocate resources and supress late callbacks from media thread.
-+  Shutdown();
- }
- 
- template <typename Traits>
-diff --git a/third_party/blink/renderer/modules/webcodecs/decoder_template.h b/third_party/blink/renderer/modules/webcodecs/decoder_template.h
-index bc186b60c84e2b4b76468f21a9305c5792796e7e..c16dbeee58048644291fe856e33573068da3c69f 100644
---- a/third_party/blink/renderer/modules/webcodecs/decoder_template.h
-+++ b/third_party/blink/renderer/modules/webcodecs/decoder_template.h
-@@ -29,6 +29,10 @@
- #include "third_party/blink/renderer/platform/heap/heap_allocator.h"
- #include "third_party/blink/renderer/platform/heap/member.h"
- 
-+namespace base {
-+class SingleThreadTaskRunner;
-+}
-+
- namespace media {
- class GpuVideoAcceleratorFactories;
- class ScopedDecodeTrace;
-@@ -227,6 +231,9 @@ class MODULES_EXPORT DecoderTemplate
- 
-   // Keyframes are required after configure(), flush(), and reset().
-   bool require_key_frame_ = true;
-+
-+  // Task runner for main thread.
-+  scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
- };
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/modules/webcodecs/decoder_template_test.cc b/third_party/blink/renderer/modules/webcodecs/decoder_template_test.cc
-index ebc7395606a8a2574d1639db8cc8ae5d3c9cdde9..36cbf25cbc5582f83ff4d9c945a4c514aa520885 100644
---- a/third_party/blink/renderer/modules/webcodecs/decoder_template_test.cc
-+++ b/third_party/blink/renderer/modules/webcodecs/decoder_template_test.cc
-@@ -215,9 +215,6 @@ TYPED_TEST(DecoderTemplateTest, MAYBE_CodecReclamation) {
-   testing::Mock::VerifyAndClearExpectations(error_callback);
- }
- 
--// Note: AudioDecoder and VideoDecoder specific tests should be put in
--// audio_decoder_test.cc and video_decoder_test.cc respectively.
--
- }  // namespace
- 
- }  // namespace blink

patches/chromium/m98_fs_fix_fileutil_lifetime_issue.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Austin Sullivan <asully@chromium.org>
-Date: Thu, 10 Feb 2022 22:18:54 +0000
-Subject: M98: FS: Fix FileUtil lifetime issue
-
-Keeps FileSystemContext alive while while resolving a URL on an open
-file system, removing the possibility of the file system being
-destroyed while a URL is being resolved on it.
-
-(cherry picked from commit 3fdf2adf11b3c716c9015597d30b59bffc7ac91b)
-
-Bug: 1275622, 1289394
-Change-Id: Ic1b97552f9d41a61163d72ff8c605699f673f55f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3373583
-Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
-Commit-Queue: Austin Sullivan <asully@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#968470}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3451059
-Auto-Submit: Austin Sullivan <asully@chromium.org>
-Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4758@{#1131}
-Cr-Branched-From: 4a2cf4baf90326df19c3ee70ff987960d59a386e-refs/heads/main@{#950365}
-
-diff --git a/storage/browser/file_system/file_system_context.cc b/storage/browser/file_system/file_system_context.cc
-index f6362869e4f6767c5a95b363fceca3455b9a9b1a..ea499242a6b81f7c74bbdeb50c08af096a0b0867 100644
---- a/storage/browser/file_system/file_system_context.cc
-+++ b/storage/browser/file_system/file_system_context.cc
-@@ -430,9 +430,22 @@ void FileSystemContext::OpenFileSystem(const blink::StorageKey& storage_key,
-     return;
-   }
- 
-+  // Bind `this` to the callback to ensure this instance stays alive while the
-+  // URL is resolving.
-   backend->ResolveURL(
-       CreateCrackedFileSystemURL(storage_key, type, base::FilePath()), mode,
--      std::move(callback));
-+      base::BindOnce(&FileSystemContext::DidResolveURLOnOpenFileSystem, this,
-+                     std::move(callback)));
-+}
-+
-+void FileSystemContext::DidResolveURLOnOpenFileSystem(
-+    OpenFileSystemCallback callback,
-+    const GURL& filesystem_root,
-+    const std::string& filesystem_name,
-+    base::File::Error error) {
-+  DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-+
-+  std::move(callback).Run(filesystem_root, filesystem_name, error);
- }
- 
- void FileSystemContext::ResolveURL(const FileSystemURL& url,
-diff --git a/storage/browser/file_system/file_system_context.h b/storage/browser/file_system/file_system_context.h
-index 99699365e0a4c4fe8280cd3aa64c30dce124651d..f768bcc456a737d46e5e551c8d7e2b1a421f620b 100644
---- a/storage/browser/file_system/file_system_context.h
-+++ b/storage/browser/file_system/file_system_context.h
-@@ -402,6 +402,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) FileSystemContext
-                                       const std::string& filesystem_name,
-                                       base::File::Error error);
- 
-+  void DidResolveURLOnOpenFileSystem(OpenFileSystemCallback callback,
-+                                     const GURL& filesystem_root,
-+                                     const std::string& filesystem_name,
-+                                     base::File::Error error);
-+
-   // Returns a FileSystemBackend, used only by test code.
-   SandboxFileSystemBackend* sandbox_backend() const {
-     return sandbox_backend_.get();

patches/chromium/mas_no_private_api.patch

@@ -191,7 +191,7 @@ index 0282b3c04cf0281820b716d0991af5ac4d6304de..ad0da68df963cc0872dc545ef525128f
  // is concerned.
  @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b422b544d 100644
+index 06e0766c6023768dc88f4d7deb28b1960c594ebb..980b855b6c52bdc39bf9e79e2b1618bd5d31c0cb 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
 @@ -206,6 +206,7 @@
@@ -391,7 +391,7 @@ index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b
    if ([attribute
            isEqualToString:
                NSAccessibilityUIElementForTextMarkerParameterizedAttribute]) {
-@@ -3233,6 +3264,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3231,6 +3262,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
  
      return CreateTextMarker(root->CreateTextPositionAt(index));
    }
@@ -399,7 +399,7 @@ index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b
  
    if ([attribute isEqualToString:
                       NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -3263,6 +3295,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3261,6 +3293,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
      return nil;
    }
  
@@ -407,7 +407,7 @@ index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b
    if ([attribute
            isEqualToString:
                NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-@@ -3382,6 +3415,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3380,6 +3413,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
  
      return @(child->GetIndexInParent());
    }
@@ -415,7 +415,7 @@ index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b
  
    return nil;
  }
-@@ -3948,6 +3982,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3946,6 +3980,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
                ->AsTextSelectionPosition()));
      }
    }
@@ -423,7 +423,7 @@ index 37530717d17ea339635bc390cf47e4adf601fff4..6281d3f75d34a13f35b69be6f8be952b
    if ([attribute
            isEqualToString:NSAccessibilitySelectedTextMarkerRangeAttribute]) {
      BrowserAccessibility::AXRange range = CreateRangeFromTextMarkerRange(value);
-@@ -3958,6 +3993,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3956,6 +3991,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
          range.anchor()->AsTextSelectionPosition(),
          range.focus()->AsTextSelectionPosition()));
    }

patches/chromium/merge_m-97_serial_check_for_detached_buffers_when_writing.patch

@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Reilly Grant <reillyg@chromium.org>
-Date: Fri, 12 Nov 2021 20:09:12 +0000
-Subject: serial: Check for detached buffers when writing
-
-This change adds check in SerialPortUnderlyingSink::WriteData() to
-ensure that the V8BufferSource being written to the Mojo data pipe has
-not been detached since it was passed to the WritableStream.
-
-(cherry picked from commit 7ce1516b49e86430c9216d0df8e23a325104a8c5)
-
-Bug: 1267627
-Change-Id: I63d48584eb0be1c1d87c27115900aa5c17931fcf
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3269348
-Commit-Queue: Reilly Grant <reillyg@chromium.org>
-Auto-Submit: Reilly Grant <reillyg@chromium.org>
-Reviewed-by: Hongchan Choi <hongchan@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#940631}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279207
-Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4692@{#132}
-Cr-Branched-From: 038cd96142d384c0d2238973f1cb277725a62eba-refs/heads/main@{#938553}
-
-diff --git a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
-index 08ab2c7e05668710b77712f3ffc0d5aeef4dd213..7876baf19a1f547c71e2a115db8a2cc4ccd43a3b 100644
---- a/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
-+++ b/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc
-@@ -172,12 +172,25 @@ void SerialPortUnderlyingSink::WriteData() {
-   DCHECK(buffer_source_);
- 
-   DOMArrayPiece array_piece(buffer_source_);
-+  // From https://webidl.spec.whatwg.org/#dfn-get-buffer-source-copy, if the
-+  // buffer source is detached then an empty byte sequence is returned, which
-+  // means the write is complete.
-+  if (array_piece.IsDetached()) {
-+    buffer_source_ = nullptr;
-+    offset_ = 0;
-+    pending_operation_->Resolve();
-+    pending_operation_ = nullptr;
-+    return;
-+  }
-+
-   if (array_piece.ByteLength() > std::numeric_limits<uint32_t>::max()) {
--    pending_exception_ = DOMException::Create(
--        "Buffer size exceeds maximum heap object size.", "DataError");
-+    pending_exception_ = MakeGarbageCollected<DOMException>(
-+        DOMExceptionCode::kDataError,
-+        "Buffer size exceeds maximum heap object size.");
-     PipeClosed();
-     return;
-   }
-+
-   const uint8_t* data = array_piece.Bytes();
-   const uint32_t length = static_cast<uint32_t>(array_piece.ByteLength());
- 
-diff --git a/third_party/blink/web_tests/external/wpt/serial/serialPort_writable.https.any.js b/third_party/blink/web_tests/external/wpt/serial/serialPort_writable.https.any.js
-index 9728af7de5051dce874e10082e1443a3ca9fa7dc..5e3b8548a91ddc2a0afa9793dea167f8e89defe3 100644
---- a/third_party/blink/web_tests/external/wpt/serial/serialPort_writable.https.any.js
-+++ b/third_party/blink/web_tests/external/wpt/serial/serialPort_writable.https.any.js
-@@ -70,7 +70,7 @@ serial_test(async (t, fake) => {
-   compareArrays(data, value);
- 
-   await port.close();
--}, 'Can read a large amount of data');
-+}, 'Can write a large amount of data');
- 
- serial_test(async (t, fake) => {
-   const {port, fakePort} = await getFakeSerialPort(fake);
-diff --git a/third_party/blink/web_tests/external/wpt/serial/serialPort_writable_detachBuffer.https.any.js b/third_party/blink/web_tests/external/wpt/serial/serialPort_writable_detachBuffer.https.any.js
-new file mode 100644
-index 0000000000000000000000000000000000000000..828e877726b1c63dba14efc36324d9a16aa4e62f
---- /dev/null
-+++ b/third_party/blink/web_tests/external/wpt/serial/serialPort_writable_detachBuffer.https.any.js
-@@ -0,0 +1,48 @@
-+// META: script=/resources/test-only-api.js
-+// META: script=/serial/resources/common.js
-+// META: script=resources/automation.js
-+
-+function detachBuffer(buffer) {
-+  const channel = new MessageChannel();
-+  channel.port1.postMessage('', [buffer]);
-+}
-+
-+serial_test(async (t, fake) => {
-+  const {port, fakePort} = await getFakeSerialPort(fake);
-+  await port.open({baudRate: 9600, bufferSize: 64});
-+
-+  const writer = port.writable.getWriter();
-+  const data = new Uint8Array(64);
-+  detachBuffer(data.buffer);
-+
-+  // Writing a detached buffer is equivalent to writing an empty buffer so this
-+  // should trivially succeed.
-+  await writer.write(data);
-+  writer.releaseLock();
-+
-+  await port.close();
-+}, 'Writing a detached buffer is safe');
-+
-+serial_test(async (t, fake) => {
-+  const {port, fakePort} = await getFakeSerialPort(fake);
-+  // Select a buffer size smaller than the amount of data transferred.
-+  await port.open({baudRate: 9600, bufferSize: 64});
-+
-+  // Start writing a buffer much larger than bufferSize above so that it can't
-+  // all be transfered in a single operation.
-+  const writer = port.writable.getWriter();
-+  const data = new Uint8Array(1024);
-+  const promise = writer.write(data);
-+  writer.releaseLock();
-+
-+  // Read half of the written data and then detach the buffer.
-+  await fakePort.readable();
-+  await fakePort.readWithLength(data.byteLength / 2);
-+  detachBuffer(data.buffer);
-+
-+  // When the buffer is detached its length becomes zero and so the write should
-+  // succeed but it is undefined how much data was written before that happened.
-+  await promise;
-+
-+  await port.close();
-+}, 'Detaching a buffer while writing is safe');

patches/chromium/notification_provenance.patch

@@ -107,7 +107,7 @@ index 78f9ab684d2eeef9a647d82ccb39c1b208e999d4..d55a4e51a0d263ec07ca115715cccc30
        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 d26c4d7ce3501a9adc03049c232542624b023d22..3d17af73a34eb4bbc71119cd8019547cc757565e 100644
+index 00a6377d2136771abf68d19bc5cb0a03b2a3d738..7e9d623030976aef80b37d2a224abc9b3013ede7 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -2245,7 +2245,7 @@ void RenderProcessHostImpl::CreateNotificationService(

patches/chromium/printing.patch

@@ -147,7 +147,7 @@ index 288b9f89129de88ea078b2e6d3b2d255dd527a95..e9979d5c9707e94580d4a10b4c48c32c
  }
  
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f34d13884 100644
+index 2011d52338081666b4761e0bf66d01245abd0213..647ac4cd9730c8983868ea165907b7c9a42767aa 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -28,10 +28,10 @@
@@ -223,10 +223,10 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
 +                                    bool silent,
 +                                    base::Value 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
-   // `DisconnectFromCurrentPrintJob()`.
-@@ -377,7 +388,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+   auto weak_this = weak_ptr_factory_.GetWeakPtr();
+   DisconnectFromCurrentPrintJob();
+   if (!weak_this)
+@@ -369,7 +380,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
    // go in `ReleasePrintJob()`.
  
    SetPrintingRFH(rfh);
@@ -242,7 +242,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -536,9 +554,9 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -528,9 +546,9 @@ void PrintViewManagerBase::ScriptedPrintReply(
  void PrintViewManagerBase::UpdatePrintingEnabled() {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    // The Unretained() is safe because ForEachFrame() is synchronous.
@@ -255,7 +255,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -652,12 +670,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -644,12 +662,13 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -270,7 +270,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
-@@ -675,18 +694,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -667,18 +686,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -292,7 +292,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -696,6 +717,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -688,6 +709,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -300,7 +300,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
  
    content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
    auto callback_wrapper =
-@@ -735,7 +757,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -727,7 +749,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -308,7 +308,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
  #endif
  
    ReleasePrinterQuery();
-@@ -750,6 +771,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -742,6 +763,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -320,7 +320,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -828,6 +854,11 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
+@@ -820,6 +846,11 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
  #endif
        break;
      }
@@ -332,7 +332,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
      case JobEventDetails::JOB_DONE:
        // Printing is done, we don't need it anymore.
        // print_job_->is_job_pending() may still be true, depending on the order
-@@ -897,7 +928,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -889,7 +920,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -344,7 +344,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    if (!weak_this)
      return false;
  
-@@ -920,8 +954,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -912,8 +946,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
                          /*source_id=*/"");
  #endif
  
@@ -353,7 +353,7 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    printing_succeeded_ = false;
    return true;
  }
-@@ -973,6 +1005,16 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -965,14 +997,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
    content::RenderFrameHost* rfh = printing_rfh_;
    printing_rfh_ = nullptr;
  
@@ -370,16 +370,15 @@ index 5491e04e7eba8ad7a29f1cb3aa51ee13716e0d9d..2f2348f3d2e35bfcf419b654032a799f
    if (!print_job_)
      return;
  
-@@ -983,8 +1025,6 @@ void PrintViewManagerBase::ReleasePrintJob() {
+   if (rfh)
      GetPrintRenderFrame(rfh)->PrintingDone(printing_succeeded_);
-   }
  
 -  registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
 -                    content::Source<PrintJob>(print_job_.get()));
    // Don't close the worker thread.
    print_job_ = nullptr;
  }
-@@ -1022,7 +1062,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1010,7 +1050,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -443,7 +442,7 @@ index 51ebcb4ae399018d3fd8566656596a7ef1f148af..5f2b807fc364131f4c3e6a1646ec522d
    // 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
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index c16d8984805619f1f1382e1e5b932771fcc0f44b..01c18d78221bbb7fa26638d778d4a7d33264d129 100644
+index 2760a694a946eb2e4dba1ee228dc5fc13a2fc98e..769976022186037d8e75e244bdb0450c5670b5c0 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -38,6 +38,7 @@
@@ -474,7 +473,7 @@ index c16d8984805619f1f1382e1e5b932771fcc0f44b..01c18d78221bbb7fa26638d778d4a7d3
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
 @@ -1268,7 +1270,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
-   // plugin node and print that instead.
+   // that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
 -  Print(frame, plugin, PrintRequestType::kRegular);
@@ -548,52 +547,18 @@ index c16d8984805619f1f1382e1e5b932771fcc0f44b..01c18d78221bbb7fa26638d778d4a7d3
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2173,36 +2188,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2173,7 +2188,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
 -bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
--  mojom::PrintPagesParams settings;
--  settings.params = mojom::PrintParams::New();
--  GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
 +bool PrintRenderFrameHelper::InitPrintSettings(
 +    bool fit_to_paper_size,
 +    const base::DictionaryValue& new_settings) {
-+  mojom::PrintPagesParamsPtr settings;
-+
-+  if (new_settings.DictEmpty()) {
-+    settings = mojom::PrintPagesParams::New();
-+    settings->params = mojom::PrintParams::New();
-+    GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
-+  } else {
-+    bool canceled = false;
-+    int cookie =
-+      print_pages_params_ ? print_pages_params_->params->document_cookie : 0;
-+    GetPrintManagerHost()->UpdatePrintSettings(cookie, new_settings.Clone(), &settings, &canceled);
-+    if (canceled)
-+      return false;
-+  }
- 
-   // Check if the printer returned any settings, if the settings is empty, we
-   // can safely assume there are no printer drivers configured. So we safely
-   // terminate.
-   bool result = true;
--  if (!PrintMsg_Print_Params_IsValid(*settings.params))
-+  if (!PrintMsg_Print_Params_IsValid(*settings->params))
-     result = false;
- 
-   // Reset to default values.
-   ignore_css_margins_ = false;
--  settings.pages.clear();
-+  settings->pages.clear();
- 
--  settings.params->print_scaling_option =
-+  settings->params->print_scaling_option =
-       fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
-                         : mojom::PrintScalingOption::kSourceSize;
- 
--  SetPrintPagesParams(settings);
-+  SetPrintPagesParams(*settings);
+   mojom::PrintPagesParams settings;
+   settings.params = mojom::PrintParams::New();
+   GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
+@@ -2197,12 +2214,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
    return result;
  }
  
@@ -612,7 +577,7 @@ index c16d8984805619f1f1382e1e5b932771fcc0f44b..01c18d78221bbb7fa26638d778d4a7d3
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2573,18 +2603,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
+@@ -2573,18 +2592,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {

patches/chromium/process_singleton.patch

@@ -76,10 +76,10 @@ index 0d7c1db6489d95a40c66808c3f838b0740e46ff6..eec994c4252f17d9c9c41e66d5dae650
  
  #if defined(OS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830ce1c99be 100644
+index 4547eb8563e1af57aad991d9d1e2cf02c778380a..727333dd6abec99643e31bc77ed2cc8f3d5a0a0b 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -82,6 +82,7 @@
+@@ -80,6 +80,7 @@
  #include "base/strings/stringprintf.h"
  #include "base/strings/sys_string_conversions.h"
  #include "base/strings/utf_string_conversions.h"
@@ -87,7 +87,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  #include "base/threading/platform_thread.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "base/time/time.h"
-@@ -97,9 +98,11 @@
+@@ -95,9 +96,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -99,7 +99,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  
  #if defined(TOOLKIT_VIEWS) && \
      (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -348,6 +351,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+@@ -289,6 +292,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -109,7 +109,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -367,6 +373,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -308,6 +314,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -117,7 +117,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -407,6 +414,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -348,6 +355,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -139,7 +139,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -788,6 +810,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -729,6 +751,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -150,7 +150,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -956,6 +982,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -897,6 +923,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -171,7 +171,7 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1055,14 +1095,32 @@ bool ProcessSingleton::Create() {
+@@ -999,12 +1039,26 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -180,15 +180,15 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
 -  // do not support Unix domain sockets.
 -  if (!socket_dir_.CreateUniqueTempDir()) {
 -    LOG(ERROR) << "Failed to create socket directory.";
-+  base::FilePath tmp_dir;
-+  if (!base::GetTempDir(&tmp_dir)) {
-+    LOG(ERROR) << "Failed to get temporary directory.";
-     return false;
-   }
- 
+-    return false;
 +  if (IsAppSandboxed()) {
 +    // For sandboxed applications, the tmp dir could be too long to fit
 +    // addr->sun_path, so we need to make it as short as possible.
++    base::FilePath tmp_dir;
++    if (!base::GetTempDir(&tmp_dir)) {
++      LOG(ERROR) << "Failed to get temporary directory.";
++      return false;
++    }
 +    if (!socket_dir_.Set(tmp_dir.Append("S"))) {
 +      LOG(ERROR) << "Failed to set socket directory.";
 +      return false;
@@ -197,19 +197,14 @@ index f9f5a2a2240b8249f81e9fe95209ef651a09e88e..3dffe87e6a561826e7f90bce9727d830
 +    // Create the socket file somewhere in /tmp which is usually mounted as a
 +    // normal filesystem. Some network filesystems (notably AFS) are screwy and
 +    // do not support Unix domain sockets.
-+    // Prefer CreateUniqueTempDirUnderPath rather than CreateUniqueTempDir as
-+    // the latter will calculate unique paths based on bundle ids which can
-+    // increase the socket path length than what is allowed.
-+    if (!socket_dir_.CreateUniqueTempDirUnderPath(tmp_dir)) {
++    if (!socket_dir_.CreateUniqueTempDir()) {
 +      LOG(ERROR) << "Failed to create socket directory.";
 +      return false;
 +    }
-+  }
-+
+   }
+ 
    // Check that the directory was created with the correct permissions.
-   int dir_mode = 0;
-   CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1105,10 +1163,13 @@ bool ProcessSingleton::Create() {
+@@ -1046,10 +1100,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);