Bump v11.0.2

This reverts commit 4dc98f1347.

.circleci/config.yml

@@ -107,6 +107,7 @@ env-release-build: &env-release-build
   STRIP_BINARIES: true
   GENERATE_SYMBOLS: true
   CHECK_DIST_MANIFEST: '1'
+  IS_RELEASE: true
 
 env-headless-testing: &env-headless-testing
   DISPLAY: ':99.0'
@@ -256,23 +257,34 @@ step-gclient-sync: &step-gclient-sync
           "$CIRCLE_REPOSITORY_URL"
 
         ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
-        # Re-export all the patches to check if there were changes.
-        python src/electron/script/export_all_patches.py src/electron/patches/config.json
-        cd src/electron
-        git update-index --refresh || true
-        if ! git diff-index --quiet HEAD --; then
-          # There are changes to the patches. Make a git commit with the updated patches
-          git add patches
-          GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="anonymous@electronjs.org" git commit -m "update patches" --author="Electron Bot <anonymous@electronjs.org>"
-          # Export it
-          mkdir -p ../../patches
-          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          echo
-          echo "======================================================================"
-          echo "There were changes to the patches when applying."
-          echo "Check the CI artifacts for a patch you can apply to fix it."
-          echo "======================================================================"
-          exit 1
+        if [ "$IS_RELEASE" != "true" ]; then
+          # Re-export all the patches to check if there were changes.
+          python src/electron/script/export_all_patches.py src/electron/patches/config.json
+          cd src/electron
+          git update-index --refresh || true
+          if ! git diff-index --quiet HEAD --; then
+            # There are changes to the patches. Make a git commit with the updated patches
+            git add patches
+            GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="electron@github.com" git commit -m "update patches" --author="Electron Bot <electron@github.com>"
+            # Export it
+            mkdir -p ../../patches
+            git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
+            if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
+              echo
+              echo "======================================================================"
+              echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
+              echo "A new CI job will kick off shortly"
+              echo "======================================================================"
+              exit 1
+            else
+              echo
+              echo "======================================================================"
+              echo "There were changes to the patches when applying."
+              echo "Check the CI artifacts for a patch you can apply to fix it."
+              echo "======================================================================"
+              exit 1
+            fi
+          fi
         fi
       fi
 
@@ -662,10 +674,10 @@ step-electron-publish: &step-electron-publish
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --upload_to_s3
+        script/release/uploaders/upload.py --verbose --upload_to_s3
       else
         echo 'Uploading Electron release distribution to Github releases'
-        script/release/uploaders/upload.py
+        script/release/uploaders/upload.py --verbose
       fi
 
 step-persist-data-for-tests: &step-persist-data-for-tests

BUILD.gn

@@ -661,6 +661,14 @@ source_set("electron_lib") {
       "shell/browser/electron_pdf_web_contents_helper_client.h",
     ]
   }
+
+  if (is_win && enable_win_dark_mode_window_ui) {
+    sources += [
+      "shell/browser/win/dark_mode.cc",
+      "shell/browser/win/dark_mode.h",
+    ]
+    libs += [ "uxtheme.lib" ]
+  }
 }
 
 electron_paks("packed_resources") {

DEPS

@@ -14,7 +14,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '87.0.4280.27',
+    '87.0.4280.67',
   'node_version':
     'v12.18.3',
   'nan_version':

ELECTRON_VERSION

@@ -1 +1 @@
-11.0.0-beta.18
+11.0.2

appveyor.yml

@@ -101,6 +101,11 @@ build_script:
           } else {
             # update external binaries
             python src/electron/script/update-external-binaries.py
+            # update angle
+            cd src\third_party\angle
+            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+            git fetch
+            cd ..\..\..
           }
         } else {    
           # file does not exist, gclient sync, then zip
@@ -224,10 +229,10 @@ deploy_script:
       if (Test-Path Env:\ELECTRON_RELEASE) {
         if (Test-Path Env:\UPLOAD_TO_S3) {
           Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --upload_to_s3
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py
+          & python script\release\uploaders\upload.py --verbose
         }
       } elseif (Test-Path Env:\TEST_WOA) {
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH

buildflags/BUILD.gn

@@ -21,6 +21,7 @@ buildflag_header("buildflags") {
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
     "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
+    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -36,4 +36,7 @@ declare_args() {
 
   # Enable Spellchecker support
   enable_builtin_spellchecker = true
+
+  # Undocumented Windows dark mode API
+  enable_win_dark_mode_window_ui = false
 }

chromium_src/BUILD.gn

@@ -277,13 +277,15 @@ static_library("chrome") {
     }
   }
 
-  sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
-  if (is_mac) {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
-  } else if (is_win) {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
-  } else {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
+  if (!is_mas_build) {
+    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
+    if (is_mac) {
+      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
+    } else if (is_win) {
+      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
+    } else {
+      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
+    }
   }
 }
 

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -826,10 +826,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
   to_send.append(current_dir.value());
 
   const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-  for (std::vector<std::string>::const_iterator it = argv.begin();
-       it != argv.end(); ++it) {
+  for (const auto& arg : argv) {
     to_send.push_back(kTokenDelimiter);
-    to_send.append(*it);
+    to_send.append(arg);
   }
 
   // Send the message

chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc

@@ -122,8 +122,7 @@ void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
                                                    GParamSpec* /* ignored */) {
   // If the name owner changed, we need to reregister all the live x11::Window
   // with the system.
-  for (std::set<x11::Window>::const_iterator it = live_windows_.begin();
-       it != live_windows_.end(); ++it) {
-    RegisterXWindow(*it);
+  for (const auto& window : live_windows_) {
+    RegisterXWindow(window);
   }
 }

docs/api/app.md

@@ -1341,7 +1341,7 @@ systems Application folder. Use in combination with `app.moveToApplicationsFolde
 ### `app.moveToApplicationsFolder([options])` _macOS_
 
 * `options` Object (optional)
-  * `conflictHandler` Function<Boolean> (optional) - A handler for potential conflict in move failure.
+  * `conflictHandler` Function\<Boolean> (optional) - A handler for potential conflict in move failure.
     * `conflictType` String - The type of move conflict encountered by the handler; can be `exists` or `existsAndRunning`, where `exists` means that an app of the same name is present in the Applications directory and `existsAndRunning` means both that it exists and that it's presently running.
 
 Returns `Boolean` - Whether the move was successful. Please note that if
@@ -1485,3 +1485,12 @@ which native modules you can use in the renderer process.  For more information
 on the direction Electron is going with renderer process restarts and usage of
 native modules in the renderer process please check out this
 [Tracking Issue](https://github.com/electron/electron/issues/18397).
+
+### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
+
+A `Boolean` which when `true` indicates that the app is currently running
+under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).
+
+You can use this property to prompt users to download the arm64 version of
+your application when they are running the x64 version under Rosetta
+incorrectly.

docs/api/browser-window.md

@@ -541,6 +541,12 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted after the window has been resized.
 
+#### Event: 'resized' _macOS_ _Windows_
+
+Emitted once when the window has finished being resized.
+
+This is usually emitted when the window has been resized manually. On macOS, resizing the window with `setBounds`/`setSize` and setting the `animate` parameter to `true` will also emit this event once resizing has finished.
+
 #### Event: 'will-move' _macOS_ _Windows_
 
 Returns:
@@ -556,12 +562,12 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted when the window is being moved to a new position.
 
-__Note__: On macOS this event is an alias of `moved`.
-
-#### Event: 'moved' _macOS_
+#### Event: 'moved' _macOS_ _Windows_
 
 Emitted once when the window is moved to a new position.
 
+__Note__: On macOS this event is an alias of `move`.
+
 #### Event: 'enter-full-screen'
 
 Emitted when the window enters a full-screen state.

docs/api/ipc-main.md

@@ -91,7 +91,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`
 
 * `channel` String
-* `listener` Function<Promise<void> | any>
+* `listener` Function<Promise\<void> | any>
   * `event` IpcMainInvokeEvent
   * `...args` any[]
 
@@ -123,7 +123,7 @@ WebContents is the source of the invoke request.
 ### `ipcMain.handleOnce(channel, listener)`
 
 * `channel` String
-* `listener` Function<Promise<void> | any>
+* `listener` Function<Promise\<void> | any>
   * `event` IpcMainInvokeEvent
   * `...args` any[]
 

docs/api/session.md

@@ -349,6 +349,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 * `handler` Function | null
   * `webContents` [WebContents](web-contents.md) - WebContents requesting the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
   * `permission` String - The type of requested permission.
+    * `clipboard-read` - Request access to read from the clipboard.
     * `media` -  Request access to media devices such as camera, microphone and speakers.
     * `mediaKeySystem` - Request access to DRM protected content.
     * `geolocation` - Request access to user's current location.
@@ -384,7 +385,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
 
 #### `ses.setPermissionCheckHandler(handler)`
 
-* `handler` Function<Boolean> | null
+* `handler` Function\<Boolean> | null
   * `webContents` [WebContents](web-contents.md) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
   * `permission` String - Enum of 'media'.
   * `requestingOrigin` String - The origin URL of the permission check

docs/api/web-contents.md

@@ -1324,9 +1324,9 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
   * `collate` Boolean (optional) - Whether the web page should be collated.
   * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the start page.
-    * `to` Number - the end page.
+  * `pageRanges` Object[] (optional) - The page range to print. On macOS, only one range is honored.
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
   * `dpi` Record<string, number> (optional)
     * `horizontal` Number (optional) - The horizontal dpi.
@@ -1352,10 +1352,10 @@ Example usage:
 const options = {
   silent: true,
   deviceName: 'My-Printer',
-  pageRanges: {
+  pageRanges: [{
     from: 0,
     to: 1
-  }
+  }]
 }
 win.webContents.print(options, (success, errorType) => {
   if (!success) console.log(errorType)
@@ -1373,8 +1373,8 @@ win.webContents.print(options, (success, errorType) => {
     default margin, 1 for no margin, and 2 for minimum margin.
   * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
   * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - zero-based index of the first page to print.
-    * `to` Number - zero-based index of the last page to print (inclusive).
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
   `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.

docs/api/webview-tag.md

@@ -560,9 +560,9 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
   * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
   * `collate` Boolean (optional) - Whether the web page should be collated.
   * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - zero-based index of the first page to print.
-    * `to` Number - zero-based index of the last page to print (inclusive).
+  * `pageRanges` Object[] (optional) - The page range to print.
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
   * `dpi` Record<string, number> (optional)
     * `horizontal` Number (optional) - The horizontal dpi.
@@ -588,8 +588,8 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
     and `width` in microns.
   * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
   * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the first page to print.
-    * `to` Number - the last page to print (inclusive).
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
   `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.

docs/development/build-instructions-gn.md

@@ -177,12 +177,12 @@ $ gn gen out/Testing-x86 --args='... target_cpu = "x86"'
 
 Not all combinations of source and target CPU/OS are supported by Chromium.
 
-<table>
-<tr><th>Host</th><th>Target</th><th>Status</th></tr>
-<tr><td>Windows x64</td><td>Windows arm64</td><td>Experimental</td>
-<tr><td>Windows x64</td><td>Windows x86</td><td>Automatically tested</td></tr>
-<tr><td>Linux x64</td><td>Linux x86</td><td>Automatically tested</td></tr>
-</table>
+| Host        | Target        | Status               |
+|-------------|---------------|----------------------|
+| Windows x64 | Windows arm64 | Experimental         |
+| Windows x64 | Windows x86   | Automatically tested |
+| Linux x64   | Linux x86     | Automatically tested |
+
 
 If you test other combinations and find them to work, please update this document :)
 

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

@@ -43,8 +43,8 @@ SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\sym
 
 ## Using the symbol server in Visual Studio
 
-<img src='https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg'>
-<img src='https://mdn.mozillademos.org/files/2497/2005_options.gif'>
+![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
 

filenames.gni

@@ -363,6 +363,7 @@ filenames = {
     "shell/browser/electron_web_ui_controller_factory.h",
     "shell/browser/event_emitter_mixin.cc",
     "shell/browser/event_emitter_mixin.h",
+    "shell/browser/extended_web_contents_observer.h",
     "shell/browser/feature_list.cc",
     "shell/browser/feature_list.h",
     "shell/browser/file_select_helper.cc",
@@ -444,6 +445,7 @@ filenames = {
     "shell/browser/ui/devtools_manager_delegate.h",
     "shell/browser/ui/devtools_ui.cc",
     "shell/browser/ui/devtools_ui.h",
+    "shell/browser/ui/drag_util.cc",
     "shell/browser/ui/drag_util.h",
     "shell/browser/ui/electron_menu_model.cc",
     "shell/browser/ui/electron_menu_model.h",

lib/common/parse-features-string.ts

@@ -38,7 +38,7 @@ const keysOfTypeNumber = ['top', 'left', ...Object.keys(keysOfTypeNumberCompileT
 type CoercedValue = string | number | boolean;
 function coerce (key: string, value: string): CoercedValue {
   if (keysOfTypeNumber.includes(key)) {
-    return Number(value);
+    return parseInt(value, 10);
   }
 
   switch (value) {

lib/renderer/api/remote.ts

@@ -298,7 +298,7 @@ function metaToError (meta: { type: 'error', value: any, members: ObjectMember[]
 }
 
 function handleMessage (channel: string, handler: Function) {
-  ipcRendererInternal.on(channel, (event, passedContextId, id, ...args) => {
+  ipcRendererInternal.onMessageFromMain(channel, (event, passedContextId, id, ...args) => {
     if (passedContextId === contextId) {
       handler(id, ...args);
     } else {

lib/renderer/content-scripts-injector.ts

@@ -1,119 +0,0 @@
-import { webFrame } from 'electron';
-
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
-const v8Util = process._linkedBinding('electron_common_v8_util');
-
-const IsolatedWorldIDs = {
-  /**
-   * Start of extension isolated world IDs, as defined in
-   * electron_render_frame_observer.h
-   */
-  ISOLATED_WORLD_EXTENSIONS: 1 << 20
-};
-
-let isolatedWorldIds = IsolatedWorldIDs.ISOLATED_WORLD_EXTENSIONS;
-const extensionWorldId: {[key: string]: number | undefined} = {};
-
-// https://cs.chromium.org/chromium/src/extensions/renderer/script_injection.cc?type=cs&sq=package:chromium&g=0&l=52
-const getIsolatedWorldIdForInstance = () => {
-  // TODO(samuelmaddock): allocate and cleanup IDs
-  return isolatedWorldIds++;
-};
-
-const escapePattern = function (pattern: string) {
-  return pattern.replace(/[\\^$+?.()|[\]{}]/g, '\\$&');
-};
-
-// Check whether pattern matches.
-// https://developer.chrome.com/extensions/match_patterns
-const matchesPattern = function (pattern: string) {
-  if (pattern === '<all_urls>') return true;
-  const regexp = new RegExp(`^${pattern.split('*').map(escapePattern).join('.*')}$`);
-  const url = `${location.protocol}//${location.host}${location.pathname}`;
-  return url.match(regexp);
-};
-
-// Run the code with chrome API integrated.
-const runContentScript = function (this: any, extensionId: string, url: string, code: string) {
-  // Assign unique world ID to each extension
-  const worldId = extensionWorldId[extensionId] ||
-    (extensionWorldId[extensionId] = getIsolatedWorldIdForInstance());
-
-  // store extension ID for content script to read in isolated world
-  v8Util.setHiddenValue(global, `extension-${worldId}`, extensionId);
-
-  webFrame.setIsolatedWorldInfo(worldId, {
-    name: `${extensionId} [${worldId}]`
-    // TODO(samuelmaddock): read `content_security_policy` from extension manifest
-    // csp: manifest.content_security_policy,
-  });
-
-  const sources = [{ code, url }];
-  return webFrame.executeJavaScriptInIsolatedWorld(worldId, sources);
-};
-
-const runAllContentScript = function (scripts: Array<Electron.InjectionBase>, extensionId: string) {
-  for (const { url, code } of scripts) {
-    runContentScript.call(window, extensionId, url, code);
-  }
-};
-
-const runStylesheet = function (this: any, url: string, code: string) {
-  webFrame.insertCSS(code);
-};
-
-const runAllStylesheet = function (css: Array<Electron.InjectionBase>) {
-  for (const { url, code } of css) {
-    runStylesheet.call(window, url, code);
-  }
-};
-
-// Run injected scripts.
-// https://developer.chrome.com/extensions/content_scripts
-const injectContentScript = function (extensionId: string, script: Electron.ContentScript) {
-  if (!process.isMainFrame && !script.allFrames) return;
-  if (!script.matches.some(matchesPattern)) return;
-
-  if (script.js) {
-    const fire = runAllContentScript.bind(window, script.js, extensionId);
-    if (script.runAt === 'document_start') {
-      process.once('document-start', fire);
-    } else if (script.runAt === 'document_end') {
-      process.once('document-end', fire);
-    } else {
-      document.addEventListener('DOMContentLoaded', fire);
-    }
-  }
-
-  if (script.css) {
-    const fire = runAllStylesheet.bind(window, script.css);
-    if (script.runAt === 'document_start') {
-      process.once('document-start', fire);
-    } else if (script.runAt === 'document_end') {
-      process.once('document-end', fire);
-    } else {
-      document.addEventListener('DOMContentLoaded', fire);
-    }
-  }
-};
-
-// Handle the request of chrome.tabs.executeJavaScript.
-ipcRendererUtils.handle('CHROME_TABS_EXECUTE_SCRIPT', function (
-  event: Electron.Event,
-  extensionId: string,
-  url: string,
-  code: string
-) {
-  return runContentScript.call(window, extensionId, url, code);
-});
-
-module.exports = (entries: Electron.ContentScriptEntry[]) => {
-  for (const entry of entries) {
-    if (entry.contentScripts) {
-      for (const script of entry.contentScripts) {
-        injectContentScript(entry.extensionId, script);
-      }
-    }
-  }
-};

lib/renderer/extensions/event.ts

@@ -1,20 +0,0 @@
-export class Event {
-  private listeners: Function[] = []
-
-  addListener (callback: Function) {
-    this.listeners.push(callback);
-  }
-
-  removeListener (callback: Function) {
-    const index = this.listeners.indexOf(callback);
-    if (index !== -1) {
-      this.listeners.splice(index, 1);
-    }
-  }
-
-  emit (...args: any[]) {
-    for (const listener of this.listeners) {
-      listener(...args);
-    }
-  }
-}

lib/renderer/extensions/i18n.ts

@@ -1,60 +0,0 @@
-// Implementation of chrome.i18n.getMessage
-// https://developer.chrome.com/extensions/i18n#method-getMessage
-//
-// Does not implement predefined messages:
-// https://developer.chrome.com/extensions/i18n#overview-predefined
-
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
-interface Placeholder {
-  content: string;
-  example?: string;
-}
-
-const getMessages = (extensionId: number) => {
-  try {
-    const data = ipcRendererUtils.invokeSync<string>('CHROME_GET_MESSAGES', extensionId);
-    return JSON.parse(data) || {};
-  } catch {
-    return {};
-  }
-};
-
-const replaceNumberedSubstitutions = (message: string, substitutions: string[]) => {
-  return message.replace(/\$(\d+)/, (_, number) => {
-    const index = parseInt(number, 10) - 1;
-    return substitutions[index] || '';
-  });
-};
-
-const replacePlaceholders = (message: string, placeholders: Record<string, Placeholder>, substitutions: string[] | string) => {
-  if (typeof substitutions === 'string') substitutions = [substitutions];
-  if (!Array.isArray(substitutions)) substitutions = [];
-
-  if (placeholders) {
-    Object.keys(placeholders).forEach((name: string) => {
-      let { content } = placeholders[name];
-      const substitutionsArray = Array.isArray(substitutions) ? substitutions : [];
-      content = replaceNumberedSubstitutions(content, substitutionsArray);
-      message = message.replace(new RegExp(`\\$${name}\\$`, 'gi'), content);
-    });
-  }
-
-  return replaceNumberedSubstitutions(message, substitutions);
-};
-
-const getMessage = (extensionId: number, messageName: string, substitutions: string[]) => {
-  const messages = getMessages(extensionId);
-  if (Object.prototype.hasOwnProperty.call(messages, messageName)) {
-    const { message, placeholders } = messages[messageName];
-    return replacePlaceholders(message, placeholders, substitutions);
-  }
-};
-
-exports.setup = (extensionId: number) => {
-  return {
-    getMessage (messageName: string, substitutions: string[]) {
-      return getMessage(extensionId, messageName, substitutions);
-    }
-  };
-};

lib/renderer/extensions/storage.ts

@@ -1,86 +0,0 @@
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-
-const getStorage = (storageType: string, extensionId: number, callback: Function) => {
-  if (typeof callback !== 'function') throw new TypeError('No callback provided');
-
-  ipcRendererInternal.invoke<string>('CHROME_STORAGE_READ', storageType, extensionId)
-    .then(data => {
-      if (data !== null) {
-        callback(JSON.parse(data));
-      } else {
-        // Disabled due to false positive in StandardJS
-        // eslint-disable-next-line standard/no-callback-literal
-        callback({});
-      }
-    });
-};
-
-const setStorage = (storageType: string, extensionId: number, storage: Record<string, any>, callback: Function) => {
-  const json = JSON.stringify(storage);
-  ipcRendererInternal.invoke('CHROME_STORAGE_WRITE', storageType, extensionId, json)
-    .then(() => {
-      if (callback) callback();
-    });
-};
-
-const getStorageManager = (storageType: string, extensionId: number) => {
-  return {
-    get (keys: string[], callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        if (keys == null) return callback(storage);
-
-        let defaults: Record<string, any> = {};
-        switch (typeof keys) {
-          case 'string':
-            keys = [keys];
-            break;
-          case 'object':
-            if (!Array.isArray(keys)) {
-              defaults = keys;
-              keys = Object.keys(keys);
-            }
-            break;
-        }
-
-        // Disabled due to false positive in StandardJS
-        // eslint-disable-next-line standard/no-callback-literal
-        if (keys.length === 0) return callback({});
-
-        const items: Record<string, any> = {};
-        keys.forEach((key: string) => {
-          let value = storage[key];
-          if (value == null) value = defaults[key];
-          items[key] = value;
-        });
-        callback(items);
-      });
-    },
-
-    set (items: Record<string, any>, callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        Object.keys(items).forEach(name => { storage[name] = items[name]; });
-        setStorage(storageType, extensionId, storage, callback);
-      });
-    },
-
-    remove (keys: string[], callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        if (!Array.isArray(keys)) keys = [keys];
-        keys.forEach((key: string) => {
-          delete storage[key];
-        });
-
-        setStorage(storageType, extensionId, storage, callback);
-      });
-    },
-
-    clear (callback: Function) {
-      setStorage(storageType, extensionId, {}, callback);
-    }
-  };
-};
-
-export const setup = (extensionId: number) => ({
-  sync: getStorageManager('sync', extensionId),
-  local: getStorageManager('local', extensionId)
-});

lib/renderer/extensions/web-navigation.ts

@@ -1,19 +0,0 @@
-import { Event } from '@electron/internal/renderer/extensions/event';
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-
-class WebNavigation {
-  private onBeforeNavigate = new Event()
-  private onCompleted = new Event()
-
-  constructor () {
-    ipcRendererInternal.on('CHROME_WEBNAVIGATION_ONBEFORENAVIGATE', (event: Electron.IpcRendererEvent, details: any) => {
-      this.onBeforeNavigate.emit(details);
-    });
-
-    ipcRendererInternal.on('CHROME_WEBNAVIGATION_ONCOMPLETED', (event: Electron.IpcRendererEvent, details: any) => {
-      this.onCompleted.emit(details);
-    });
-  }
-}
-
-export const setup = () => new WebNavigation();

lib/renderer/ipc-renderer-internal-utils.ts

@@ -3,7 +3,7 @@ import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-in
 type IPCHandler = (event: Electron.IpcRendererEvent, ...args: any[]) => any
 
 export const handle = function <T extends IPCHandler> (channel: string, handler: T) {
-  ipcRendererInternal.on(channel, async (event, requestId, ...args) => {
+  ipcRendererInternal.onMessageFromMain(channel, async (event, requestId, ...args) => {
     const replyChannel = `${channel}_RESPONSE_${requestId}`;
     try {
       event.sender.send(replyChannel, null, await handler(event, ...args));

lib/renderer/ipc-renderer-internal.ts

@@ -29,4 +29,27 @@ ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[])
   return result;
 };
 
+ipcRendererInternal.onMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
+  return ipcRendererInternal.on(channel, (event, ...args) => {
+    if (event.senderId !== 0) {
+      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
+      return;
+    }
+
+    listener(event, ...args);
+  });
+};
+
+ipcRendererInternal.onceMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
+  return ipcRendererInternal.on(channel, function wrapper (event, ...args) {
+    if (event.senderId !== 0) {
+      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
+      return;
+    }
+
+    ipcRendererInternal.removeListener(channel, wrapper);
+    listener(event, ...args);
+  });
+};
+
 export { ipcRendererInternal };

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

@@ -66,18 +66,18 @@ const dispatchEvent = function (
 };
 
 export function registerEvents (webView: WebViewImpl, viewInstanceId: number) {
-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
     webView.guestInstanceId = undefined;
     webView.reset();
     const domEvent = new Event('destroyed');
     webView.dispatchEvent(domEvent);
   });
 
-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
     dispatchEvent(webView, eventName, eventName, ...args);
   });
 
-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
     const domEvent = new Event('ipc-message') as IpcMessageEvent;
     domEvent.channel = channel;
     domEvent.args = args;

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

@@ -17,7 +17,7 @@ interface MutationHandler {
 
 // Attribute objects.
 // Default implementation of a WebView attribute.
-class WebViewAttribute implements MutationHandler {
+export class WebViewAttribute implements MutationHandler {
   public value: any;
   public ignoreMutation = false;
 
@@ -78,7 +78,7 @@ class BooleanAttribute extends WebViewAttribute {
 }
 
 // Attribute representing the state of the storage partition.
-class PartitionAttribute extends WebViewAttribute {
+export class PartitionAttribute extends WebViewAttribute {
   public validPartitionId = true
 
   constructor (public webViewImpl: WebViewImpl) {
@@ -102,7 +102,7 @@ class PartitionAttribute extends WebViewAttribute {
 }
 
 // Attribute that handles the location and navigation of the webview.
-class SrcAttribute extends WebViewAttribute {
+export class SrcAttribute extends WebViewAttribute {
   public observer!: MutationObserver;
 
   constructor (public webViewImpl: WebViewImpl) {
@@ -168,7 +168,7 @@ class SrcAttribute extends WebViewAttribute {
   }
 
   public parse () {
-    if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
+    if (!this.webViewImpl.elementAttached || !(this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId || !this.getValue()) {
       return;
     }
     if (this.webViewImpl.guestInstanceId == null) {
@@ -182,12 +182,12 @@ class SrcAttribute extends WebViewAttribute {
     // Navigate to |this.src|.
     const opts: Record<string, string> = {};
 
-    const httpreferrer = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER].getValue();
+    const httpreferrer = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER)!.getValue();
     if (httpreferrer) {
       opts.httpReferrer = httpreferrer;
     }
 
-    const useragent = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT].getValue();
+    const useragent = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT)!.getValue();
     if (useragent) {
       opts.userAgent = useragent;
     }
@@ -274,19 +274,18 @@ class EnableRemoteModuleAttribute extends WebViewAttribute {
 
 // Sets up all of the webview attributes.
 WebViewImpl.prototype.setupWebViewAttributes = function () {
-  this.attributes = {};
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION] = new PartitionAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC] = new SrcAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE] = new EnableRemoteModuleAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES] = new DisableBlinkFeaturesAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this);
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION, new PartitionAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC, new SrcAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER, new HttpReferrerAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT, new UserAgentAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE, new EnableRemoteModuleAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD, new PreloadAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES, new BlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES, new DisableBlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES, new WebPreferencesAttribute(this));
 };

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

@@ -16,9 +16,6 @@ export const enum WEB_VIEW_CONSTANTS {
   ATTRIBUTE_DISABLEBLINKFEATURES = 'disableblinkfeatures',
   ATTRIBUTE_WEBPREFERENCES = 'webpreferences',
 
-  // Internal attribute.
-  ATTRIBUTE_INTERNALINSTANCEID = 'internalinstanceid',
-
   // Error messages.
   ERROR_MSG_ALREADY_NAVIGATED = 'The object has already navigated, so its partition cannot be changed.',
   ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview> = ' + 'Script cannot be injected into content until the page has loaded.',

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

@@ -10,6 +10,7 @@
 
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { WebViewImpl as IWebViewImpl, webViewImplModule } from '@electron/internal/renderer/web-view/web-view-impl';
+import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 
 // Return a WebViewElement class that is defined in this context.
 const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
@@ -49,7 +50,7 @@ const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof
       if (!internal.elementAttached) {
         guestViewInternal.registerEvents(internal, internal.viewInstanceId);
         internal.elementAttached = true;
-        internal.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].parse();
+        (internal.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC) as SrcAttribute).parse();
       }
     }
 

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

@@ -5,6 +5,7 @@ import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-inte
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal';
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
+import type { WebViewAttribute, PartitionAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { deserialize } from '@electron/internal/common/type-utils';
 const { webFrame } = electron;
 
@@ -33,7 +34,7 @@ export class WebViewImpl {
   public internalElement: HTMLIFrameElement
 
   // Replaced in web-view-attributes
-  public attributes: Record<string, any> = {}
+  public attributes = new Map<string, WebViewAttribute>();
   public setupWebViewAttributes (): void {}
 
   constructor (public webviewNode: HTMLElement) {
@@ -76,7 +77,7 @@ export class WebViewImpl {
     }
 
     this.beforeFirstNavigation = true;
-    this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId = true;
+    (this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId = true;
 
     // Since attachment swaps a local frame for a remote frame, we need our
     // internal iframe element to be local again before we can reattach.
@@ -95,12 +96,12 @@ export class WebViewImpl {
   // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
   // details.
   handleWebviewAttributeMutation (attributeName: string, oldValue: any, newValue: any) {
-    if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
+    if (!this.attributes.has(attributeName) || this.attributes.get(attributeName)!.ignoreMutation) {
       return;
     }
 
     // Let the changed attribute handle its own mutation
-    this.attributes[attributeName].handleMutation(oldValue, newValue);
+    this.attributes.get(attributeName)!.handleMutation(oldValue, newValue);
   }
 
   onElementResize () {
@@ -149,7 +150,7 @@ export class WebViewImpl {
       // Touching the src attribute triggers a navigation. To avoid
       // triggering a page reload on every guest-initiated navigation,
       // we do not handle this mutation.
-      this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
+      this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC)!.setValueIgnoreMutation(newValue);
     }
   }
 
@@ -163,7 +164,7 @@ export class WebViewImpl {
   }
 
   onAttach (storagePartitionId: number) {
-    return this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].setValue(storagePartitionId);
+    return this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION)!.setValue(storagePartitionId);
   }
 
   buildParams () {
@@ -172,10 +173,8 @@ export class WebViewImpl {
       userAgentOverride: this.userAgentOverride
     };
 
-    for (const attributeName in this.attributes) {
-      if (Object.prototype.hasOwnProperty.call(this.attributes, attributeName)) {
-        params[attributeName] = this.attributes[attributeName].getValue();
-      }
+    for (const [attributeName, attribute] of this.attributes) {
+      params[attributeName] = attribute.getValue();
     }
 
     return params;

lib/renderer/window-setup.ts

@@ -181,7 +181,7 @@ class BrowserWindowProxy {
     this.guestId = guestId;
     this._location = new LocationProxy(guestId);
 
-    ipcRendererInternal.once(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
+    ipcRendererInternal.onceMessageFromMain(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
       removeProxy(guestId);
       this.closed = true;
     });
@@ -281,7 +281,7 @@ export const windowSetup = (
   if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['prompt'], window.prompt);
 
   if (!usesNativeWindowOpen || openerId != null) {
-    ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
+    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
       _event, sourceId: number, message: any, sourceOrigin: string
     ) {
       // Manually dispatch event instead of using postMessage because we also need to
@@ -336,7 +336,7 @@ export const windowSetup = (
     let cachedVisibilityState = isHiddenPage ? 'hidden' : 'visible';
 
     // Subscribe to visibilityState changes.
-    ipcRendererInternal.on('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
+    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
       if (cachedVisibilityState !== visibilityState) {
         cachedVisibilityState = visibilityState;
         document.dispatchEvent(new Event('visibilitychange'));

package.json

@@ -1,11 +1,12 @@
 {
   "name": "electron",
-  "version": "11.0.0-beta.18",
+  "version": "11.0.2",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
     "@electron/docs-parser": "^0.10.0",
     "@electron/typescript-definitions": "^8.7.5",
+    "@octokit/auth-app": "^2.10.0",
     "@octokit/rest": "^18.0.3",
     "@primer/octicons": "^10.0.0",
     "@types/basic-auth": "^1.1.3",

patches/chromium/.patches

@@ -100,4 +100,8 @@ worker_feat_add_hook_to_notify_script_ready.patch
 cherry-pick-2f5b8357dca2.patch
 fix_use_electron_generated_resources.patch
 chore_expose_v8_initialization_isolate_callbacks.patch
-rename_the_v8_context_snapshot_on_arm64_macos_builds.patch
+crashpad-initialize-logging.patch
+fix_properly_honor_printing_page_ranges.patch
+cherry-pick-8f5a08079948.patch
+cherry-pick-275865e8c237.patch
+use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch

patches/chromium/add_didinstallconditionalfeatures.patch

@@ -23,10 +23,10 @@ index f63b17435218d0d67bba044da67c1c80015fc996..d0fe24182f2cb48a1333054ce44b6a7f
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index e811aec4853c1ba0dacdcad758a5bc834643d7e3..5eb2dcde4d2033015677681ceeba7da9b9fe32df 100644
+index 72a3bd4837f37bb1bab1f5ca48e90c41a297337f..23ff9cc13aaa97d395983dceb2a27158b2d679a5 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -5034,6 +5034,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -5036,6 +5036,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  

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 497033d3d5257daffe4aca2ebdd1fd71513db73f..7412bf8f9a9e07975917514e7f4c13253112138a 100644
+index 45ce62954b5527b3906c7ec8c06c41cf2dd4d111..bc55d9109d5c34e9f2b4a19424926e7f43ad5d4e 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -4945,6 +4945,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4959,6 +4959,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 497033d3d5257daffe4aca2ebdd1fd71513db73f..7412bf8f9a9e07975917514e7f4c1325
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index a39f43b61afc70296470a9ed616d7e8a423780aa..b113c265dcf5b8e3c7533085f1b8409fa13bcfa0 100644
+index 2640a8c6371083804da42565f65fb41cf1a57607..6aa0c4db0cf1a3644a20d0fe0c7e292f3d4bbd6f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3703,9 +3703,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3712,9 +3712,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
    }
  
    if (delegate_) {
@@ -66,7 +66,7 @@ index da3aceed75b10087a86bcb8427c241fe647cdcfe..cafd45df059293bc1cf31e1d7b798e67
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 27b7e117b531bb370ea948e56b33d1a07eef11c6..9953cc472c04c2dc6ae0f70b64ea2b8d6ac86a05 100644
+index 811bc7be6b174e0695beac6ee604ca19e9402739..3b93afa004fb4d56ade2ab16147b42f26e90e3db 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -153,6 +153,7 @@ class NetworkService;
@@ -77,7 +77,7 @@ index 27b7e117b531bb370ea948e56b33d1a07eef11c6..9953cc472c04c2dc6ae0f70b64ea2b8d
  }  // namespace network
  
  namespace sandbox {
-@@ -868,6 +869,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -876,6 +877,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,

patches/chromium/cherry-pick-275865e8c237.patch

@@ -0,0 +1,413 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Robinson <mrobinson@igalia.com>
+Date: Tue, 20 Oct 2020 09:00:52 +0000
+Subject: Mac: Target a11y actions on certain containers to focused or
+ activedescendant children
+
+When an action is triggered on a container with selectable children and
+that container has a focused or activedescendant child, retarget the
+action to that child. This fixes an issue where when the VoiceOver
+cursor is on a tree with a focused child, triggered context menus would
+use the tree as the target element.
+
+menu on a tree instead of a focused child.
+
+Bug: 1114892
+Change-Id: Ibe580beed93aeaac54d1dabaee28443b290fd0e2
+AX-Relnotes: Fix an issue where VoiceOver would trigger a context
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466281
+Commit-Queue: Martin Robinson <mrobinson@igalia.com>
+Reviewed-by: Scott Violet <sky@chromium.org>
+Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
+Reviewed-by: Nektarios Paisios <nektar@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#818831}
+
+diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
+index 770c0cb6a4dad8cbf35900311a23a8296407d81d..0ffc8d768299cc5e7f37878fb656c12b028fead9 100644
+--- a/content/browser/accessibility/browser_accessibility_cocoa.h
++++ b/content/browser/accessibility/browser_accessibility_cocoa.h
+@@ -117,6 +117,14 @@ id AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker);
+ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
+     withCurrentIndex:(int*)currentIndex;
+ 
++// Choose the appropriate accessibility object to receive an action depending
++// on the characteristics of this accessibility node.
++- (content::BrowserAccessibility*)actionTarget;
++
++// Return the active descendant for this accessibility object or null if there
++// is no active descendant defined or in the case of an error.
++- (content::BrowserAccessibility*)activeDescendant;
++
+ // Internally-used property.
+ @property(nonatomic, readonly) NSPoint origin;
+ 
+diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
+index 17aa494d6473866721a8cc5f4c5c646af9307d93..71f927cd35a27dd5f656907dc177fbfe7577d3f0 100644
+--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
++++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
+@@ -1744,14 +1744,7 @@ - (id)owns {
+   // supported with VoiceOver.
+   //
+ 
+-  int activeDescendantId;
+-  if (!_owner->GetIntAttribute(ax::mojom::IntAttribute::kActivedescendantId,
+-                               &activeDescendantId))
+-    return nil;
+-
+-  BrowserAccessibilityManager* manager = _owner->manager();
+-  BrowserAccessibility* activeDescendant =
+-      manager->GetFromID(activeDescendantId);
++  BrowserAccessibility* activeDescendant = [self activeDescendant];
+   if (!activeDescendant)
+     return nil;
+ 
+@@ -3729,16 +3722,18 @@ - (void)accessibilityPerformAction:(NSString*)action {
+     return;
+ 
+   // TODO(dmazzoni): Support more actions.
+-  BrowserAccessibilityManager* manager = _owner->manager();
++  BrowserAccessibility* actionTarget = [self actionTarget];
++  BrowserAccessibilityManager* manager = actionTarget->manager();
+   if ([action isEqualToString:NSAccessibilityPressAction]) {
+-    manager->DoDefaultAction(*_owner);
+-    if (_owner->GetData().GetRestriction() != ax::mojom::Restriction::kNone ||
++    manager->DoDefaultAction(*actionTarget);
++    if (actionTarget->GetData().GetRestriction() !=
++            ax::mojom::Restriction::kNone ||
+         ![self isCheckable])
+       return;
+     // Hack: preemptively set the checked state to what it should become,
+     // otherwise VoiceOver will very likely report the old, incorrect state to
+     // the user as it requests the value too quickly.
+-    ui::AXNode* node = _owner->node();
++    ui::AXNode* node = actionTarget->node();
+     if (!node)
+       return;
+     AXNodeData data(node->TakeData());  // Temporarily take data.
+@@ -3756,13 +3751,13 @@ - (void)accessibilityPerformAction:(NSString*)action {
+     }
+     node->SetData(data);  // Set the data back in the node.
+   } else if ([action isEqualToString:NSAccessibilityShowMenuAction]) {
+-    manager->ShowContextMenu(*_owner);
++    manager->ShowContextMenu(*actionTarget);
+   } else if ([action isEqualToString:NSAccessibilityScrollToVisibleAction]) {
+-    manager->ScrollToMakeVisible(*_owner, gfx::Rect());
++    manager->ScrollToMakeVisible(*actionTarget, gfx::Rect());
+   } else if ([action isEqualToString:NSAccessibilityIncrementAction]) {
+-    manager->Increment(*_owner);
++    manager->Increment(*actionTarget);
+   } else if ([action isEqualToString:NSAccessibilityDecrementAction]) {
+-    manager->Decrement(*_owner);
++    manager->Decrement(*actionTarget);
+   }
+ }
+ 
+@@ -3871,4 +3866,32 @@ - (BOOL)accessibilityNotifiesWhenDestroyed {
+   return YES;
+ }
+ 
++// Choose the appropriate accessibility object to receive an action depending
++// on the characteristics of this accessibility node.
++- (BrowserAccessibility*)actionTarget {
++  // When an action is triggered on a container with selectable children and
++  // one of those children is an active descendant or focused, retarget the
++  // action to that child. See https://crbug.com/1114892.
++  if (!ui::IsContainerWithSelectableChildren(_owner->node()->data().role))
++    return _owner;
++
++  if (BrowserAccessibility* activeDescendant = [self activeDescendant])
++    return activeDescendant;
++
++  BrowserAccessibility* focused = _owner->manager()->GetFocus();
++  if (focused && focused->IsDescendantOf(_owner))
++    return focused;
++
++  return _owner;
++}
++
++// Return the active descendant for this accessibility object or null if there
++// is no active descendant defined or in the case of an error.
++- (BrowserAccessibility*)activeDescendant {
++  int activeDescendantId;
++  if (!_owner->GetIntAttribute(ax::mojom::IntAttribute::kActivedescendantId,
++                               &activeDescendantId))
++    return nullptr;
++  return _owner->manager()->GetFromID(activeDescendantId);
++}
+ @end
+diff --git a/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm b/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
+index 17801b9774813df79e4b944cb0a73535eb4c07c2..6eb2c484ddc479d9cfa566df0b103782264d3af8 100644
+--- a/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
++++ b/content/browser/accessibility/browser_accessibility_cocoa_browsertest.mm
+@@ -44,6 +44,35 @@
+     return web_contents->GetRootBrowserAccessibilityManager();
+   }
+ 
++  // Trigger a context menu for the provided element without showing it. Returns
++  // the coordinates where the  context menu was invoked (calculated based on
++  // the provided element). These coordinates are relative to the RenderView
++  // origin.
++  gfx::Point TriggerContextMenuAndGetMenuLocation(
++      NSAccessibilityElement* element,
++      ContextMenuFilter* filter) {
++    // accessibilityPerformAction is deprecated, but it's still used internally
++    // by AppKit.
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++    [element accessibilityPerformAction:NSAccessibilityShowMenuAction];
++    filter->Wait();
++
++    UntrustworthyContextMenuParams context_menu_params = filter->get_params();
++    return gfx::Point(context_menu_params.x, context_menu_params.y);
++#pragma clang diagnostic pop
++  }
++
++  void FocusAccessibilityElementAndWaitForFocusChange(
++      NSAccessibilityElement* element) {
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++    [element accessibilitySetValue:@(1)
++                      forAttribute:NSAccessibilityFocusedAttribute];
++#pragma clang diagnostic pop
++    WaitForAccessibilityFocusChange();
++  }
++
+  private:
+   BrowserAccessibility* FindNodeInSubtree(BrowserAccessibility& node,
+                                           ax::mojom::Role role) {
+@@ -466,4 +495,165 @@ GURL url(R"HTML(data:text/html,
+   EXPECT_NSEQ(@"AXRow", [row_nodes[1] role]);
+   EXPECT_NSEQ(@"row2", [row_nodes[1] descriptionForAccessibility]);
+ }
++
++IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
++                       TestTreeContextMenuEvent) {
++  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
++                                         ui::kAXModeComplete,
++                                         ax::mojom::Event::kLoadComplete);
++
++  GURL url(R"HTML(data:text/html,
++             <div alt="tree" role="tree">
++               <div tabindex="1" role="treeitem">1</div>
++               <div tabindex="2" role="treeitem">2</div>
++             </div>)HTML");
++
++  EXPECT_TRUE(NavigateToURL(shell(), url));
++  waiter.WaitForNotification();
++
++  BrowserAccessibility* tree = FindNode(ax::mojom::Role::kTree);
++  base::scoped_nsobject<BrowserAccessibilityCocoa> cocoa_tree(
++      [ToBrowserAccessibilityCocoa(tree) retain]);
++
++  NSArray* tree_children = [cocoa_tree children];
++  EXPECT_NSEQ(@"AXRow", [tree_children[0] role]);
++  EXPECT_NSEQ(@"AXRow", [tree_children[1] role]);
++
++  content::RenderProcessHost* render_process_host =
++      shell()->web_contents()->GetMainFrame()->GetProcess();
++  auto menu_filter = base::MakeRefCounted<ContextMenuFilter>(
++      ContextMenuFilter::ShowBehavior::kPreventShow);
++  render_process_host->AddFilter(menu_filter.get());
++
++  gfx::Point tree_point =
++      TriggerContextMenuAndGetMenuLocation(cocoa_tree, menu_filter.get());
++
++  menu_filter->Reset();
++  gfx::Point item_1_point =
++      TriggerContextMenuAndGetMenuLocation(tree_children[1], menu_filter.get());
++  ASSERT_NE(tree_point, item_1_point);
++
++  // Now focus the second child and trigger a context menu on the tree.
++  EXPECT_TRUE(
++      content::ExecuteScript(shell()->web_contents(),
++                             "document.body.children[0].children[1].focus();"));
++  WaitForAccessibilityFocusChange();
++
++  // Triggering a context menu on the tree should now trigger the menu
++  // on the focused child.
++  menu_filter->Reset();
++  gfx::Point new_point =
++      TriggerContextMenuAndGetMenuLocation(cocoa_tree, menu_filter.get());
++  ASSERT_EQ(new_point, item_1_point);
++}
++
++IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
++                       TestEventRetargetingFocus) {
++  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
++                                         ui::kAXModeComplete,
++                                         ax::mojom::Event::kLoadComplete);
++
++  GURL url(R"HTML(data:text/html,
++             <div role="tree">
++               <div tabindex="1" role="treeitem">1</div>
++               <div tabindex="2" role="treeitem">2</div>
++             </div>
++             <div role="treegrid">
++               <div tabindex="1" role="treeitem">1</div>
++               <div tabindex="2" role="treeitem">2</div>
++             </div>
++             <div role="tablist">
++               <div tabindex="1" role="tab">1</div>
++               <div tabindex="2" role="tab">2</div>
++             </div>
++             <div role="table">
++               <div tabindex="1" role="row">1</div>
++               <div tabindex="2" role="row">2</div>
++             </div>
++             <div role="banner">
++               <div tabindex="1" role="link">1</div>
++               <div tabindex="2" role="link">2</div>
++             </div>)HTML");
++
++  EXPECT_TRUE(NavigateToURL(shell(), url));
++  waiter.WaitForNotification();
++
++  std::pair<ax::mojom::Role, bool> tests[] = {
++      std::make_pair(ax::mojom::Role::kTree, true),
++      std::make_pair(ax::mojom::Role::kTreeGrid, true),
++      std::make_pair(ax::mojom::Role::kTabList, true),
++      std::make_pair(ax::mojom::Role::kTable, false),
++      std::make_pair(ax::mojom::Role::kBanner, false),
++  };
++
++  for (auto& test : tests) {
++    base::scoped_nsobject<BrowserAccessibilityCocoa> parent(
++        [ToBrowserAccessibilityCocoa(FindNode(test.first)) retain]);
++    BrowserAccessibilityCocoa* child = [parent children][1];
++
++    EXPECT_NE(nullptr, parent.get());
++    EXPECT_EQ([child owner], [child actionTarget]);
++    EXPECT_EQ([parent owner], [parent actionTarget]);
++
++    FocusAccessibilityElementAndWaitForFocusChange(child);
++    ASSERT_EQ(test.second, [parent actionTarget] == [child owner]);
++  }
++}
++
++IN_PROC_BROWSER_TEST_F(BrowserAccessibilityCocoaBrowserTest,
++                       TestEventRetargetingActiveDescendant) {
++  AccessibilityNotificationWaiter waiter(shell()->web_contents(),
++                                         ui::kAXModeComplete,
++                                         ax::mojom::Event::kLoadComplete);
++
++  GURL url(R"HTML(data:text/html,
++             <div role="tree" aria-activedescendant="tree-child">
++               <div tabindex="1" role="treeitem">1</div>
++               <div id="tree-child" tabindex="2" role="treeitem">2</div>
++             </div>
++             <div role="treegrid" aria-activedescendant="treegrid-child">
++               <div tabindex="1" role="treeitem">1</div>
++               <div id="treegrid-child" tabindex="2" role="treeitem">2</div>
++             </div>
++             <div role="tablist" aria-activedescendant="tablist-child">
++               <div tabindex="1" role="tab">1</div>
++               <div id="tablist-child" tabindex="2" role="tab">2</div>
++             </div>
++             <div role="table" aria-activedescendant="table-child">
++               <div tabindex="1" role="row">1</div>
++               <div id="table-child" tabindex="2" role="row">2</div>
++             </div>
++             <div role="banner" aria-activedescendant="banner-child">
++               <div tabindex="1" role="link">1</div>
++               <div id="banner-child" tabindex="2" role="link">2</div>
++             </div>)HTML");
++
++  EXPECT_TRUE(NavigateToURL(shell(), url));
++  waiter.WaitForNotification();
++
++  std::pair<ax::mojom::Role, bool> tests[] = {
++      std::make_pair(ax::mojom::Role::kTree, true),
++      std::make_pair(ax::mojom::Role::kTreeGrid, true),
++      std::make_pair(ax::mojom::Role::kTabList, true),
++      std::make_pair(ax::mojom::Role::kTable, false),
++      std::make_pair(ax::mojom::Role::kBanner, false),
++  };
++
++  for (auto& test : tests) {
++    base::scoped_nsobject<BrowserAccessibilityCocoa> parent(
++        [ToBrowserAccessibilityCocoa(FindNode(test.first)) retain]);
++    BrowserAccessibilityCocoa* first_child = [parent children][0];
++    BrowserAccessibilityCocoa* second_child = [parent children][1];
++
++    EXPECT_NE(nullptr, parent.get());
++    EXPECT_EQ([second_child owner], [second_child actionTarget]);
++    EXPECT_EQ(test.second, [second_child owner] == [parent actionTarget]);
++
++    // aria-activedescendant should take priority of focus for determining
++    // if an object is the action target.
++    FocusAccessibilityElementAndWaitForFocusChange(first_child);
++    EXPECT_EQ(test.second, [second_child owner] == [parent actionTarget]);
++  }
++}
++
+ }  // namespace content
+diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
+index 47161f98b2fcdacece578cde50141860d2ab0a40..a8f988b8465c420224979d805baf454483e49134 100644
+--- a/content/public/test/browser_test_utils.cc
++++ b/content/public/test/browser_test_utils.cc
+@@ -3220,10 +3220,11 @@ void VerifyStaleContentOnFrameEviction(
+ 
+ #endif  // defined(USE_AURA)
+ 
+-ContextMenuFilter::ContextMenuFilter()
++ContextMenuFilter::ContextMenuFilter(ShowBehavior behavior)
+     : BrowserMessageFilter(FrameMsgStart),
+       run_loop_(std::make_unique<base::RunLoop>()),
+-      quit_closure_(run_loop_->QuitClosure()) {}
++      quit_closure_(run_loop_->QuitClosure()),
++      show_behavior_(behavior) {}
+ 
+ bool ContextMenuFilter::OnMessageReceived(const IPC::Message& message) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+@@ -3234,6 +3235,9 @@ bool ContextMenuFilter::OnMessageReceived(const IPC::Message& message) {
+     GetUIThreadTaskRunner({})->PostTask(
+         FROM_HERE,
+         base::BindOnce(&ContextMenuFilter::OnContextMenu, this, menu_params));
++    // Returning true here blocks the default action for this message, which
++    // means that the menu will not be shown.
++    return show_behavior_ == ShowBehavior::kPreventShow;
+   }
+   return false;
+ }
+@@ -3244,6 +3248,12 @@ void ContextMenuFilter::Wait() {
+   run_loop_ = nullptr;
+ }
+ 
++void ContextMenuFilter::Reset() {
++  ASSERT_EQ(run_loop_, nullptr);
++  run_loop_ = std::make_unique<base::RunLoop>();
++  quit_closure_ = run_loop_->QuitClosure();
++}
++
+ ContextMenuFilter::~ContextMenuFilter() = default;
+ 
+ void ContextMenuFilter::OnContextMenu(
+diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
+index f68d423999ff711b46b7fe9d718163158e1d5223..3568bcceee9867db634306d36e3281d32450ea0a 100644
+--- a/content/public/test/browser_test_utils.h
++++ b/content/public/test/browser_test_utils.h
+@@ -1688,10 +1688,15 @@ void VerifyStaleContentOnFrameEviction(
+ // sent by the renderer.
+ class ContextMenuFilter : public content::BrowserMessageFilter {
+  public:
+-  ContextMenuFilter();
++  // Whether or not the ContextMenu should be prevented from performing
++  // its default action, preventing the context menu from showing.
++  enum ShowBehavior { kShow, kPreventShow };
++
++  explicit ContextMenuFilter(ShowBehavior behavior = ShowBehavior::kShow);
+ 
+   bool OnMessageReceived(const IPC::Message& message) override;
+   void Wait();
++  void Reset();
+ 
+   content::UntrustworthyContextMenuParams get_params() { return last_params_; }
+ 
+@@ -1703,6 +1708,7 @@ class ContextMenuFilter : public content::BrowserMessageFilter {
+   std::unique_ptr<base::RunLoop> run_loop_;
+   base::OnceClosure quit_closure_;
+   content::UntrustworthyContextMenuParams last_params_;
++  const ShowBehavior show_behavior_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(ContextMenuFilter);
+ };

patches/chromium/cherry-pick-8f5a08079948.patch

@@ -0,0 +1,115 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Robinson <mrobinson@igalia.com>
+Date: Mon, 26 Oct 2020 23:12:55 +0000
+Subject: Expose a11y popup menu type via the name "AXPopupValue" on Mac
+
+This value was exposed via the name "AXHasPopupValue", while WebKit
+exposes this value via "AXPopupValue." Fix the attribute name, which in
+turn fixes an issue with how popup buttons are announced in VoiceOver.
+
+Bug: 1129678
+Change-Id: Iede26b2fd6ddb9d7717fcb47fd1dd1cce5b74075
+AX-Relnotes: Fix an issue with the announcement of popup buttons in VoiceOver.
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489985
+Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
+Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#820964}
+
+diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
+index 3abd9933ab325bda6cb486a41fd6c8b246aa8e71..17aa494d6473866721a8cc5f4c5c646af9307d93 100644
+--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
++++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
+@@ -92,7 +92,7 @@
+     @"AXFocusableAncestor";
+ NSString* const NSAccessibilityGrabbedAttribute = @"AXGrabbed";
+ NSString* const NSAccessibilityHasPopupAttribute = @"AXHasPopup";
+-NSString* const NSAccessibilityHasPopupValueAttribute = @"AXHasPopupValue";
++NSString* const NSAccessibilityPopupValueAttribute = @"AXPopupValue";
+ NSString* const NSAccessibilityHighestEditableAncestorAttribute =
+     @"AXHighestEditableAncestor";
+ NSString* const NSAccessibilityInvalidAttribute = @"AXInvalid";
+@@ -836,7 +836,7 @@ + (void)initialize {
+       {NSAccessibilityGrabbedAttribute, @"grabbed"},
+       {NSAccessibilityHeaderAttribute, @"header"},
+       {NSAccessibilityHasPopupAttribute, @"hasPopup"},
+-      {NSAccessibilityHasPopupValueAttribute, @"hasPopupValue"},
++      {NSAccessibilityPopupValueAttribute, @"popupValue"},
+       {NSAccessibilityHelpAttribute, @"help"},
+       {NSAccessibilityHighestEditableAncestorAttribute,
+        @"highestEditableAncestor"},
+@@ -1411,7 +1411,7 @@ - (NSNumber*)hasPopup {
+   return @(_owner->HasIntAttribute(ax::mojom::IntAttribute::kHasPopup));
+ }
+ 
+-- (NSString*)hasPopupValue {
++- (NSString*)popupValue {
+   if (![self instanceActive])
+     return nil;
+   int hasPopup = _owner->GetIntAttribute(ax::mojom::IntAttribute::kHasPopup);
+@@ -3586,7 +3586,7 @@ - (NSArray*)accessibilityAttributeNames {
+ 
+   if (_owner->HasIntAttribute(ax::mojom::IntAttribute::kHasPopup)) {
+     [ret addObjectsFromArray:@[
+-      NSAccessibilityHasPopupAttribute, NSAccessibilityHasPopupValueAttribute
++      NSAccessibilityHasPopupAttribute, NSAccessibilityPopupValueAttribute
+     ]];
+   }
+ 
+diff --git a/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt b/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
+index e988b9fe7d061fa3aa6930ababa4f32c095bd8a3..de0f31f2065490d6085027e2800706a3926bcf5b 100644
+--- a/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
++++ b/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
+@@ -1,10 +1,10 @@
+ AXWebArea
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
+ ++AXPopUpButton
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='grid'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='dialog'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
+-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='grid'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='dialog'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
++++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
+diff --git a/content/test/data/accessibility/aria/aria-haspopup.html b/content/test/data/accessibility/aria/aria-haspopup.html
+index 026397c4e9ad805f5facfc499cc986cd0763aef3..7d982745e89b8346bf71eee90110fe6a96648629 100644
+--- a/content/test/data/accessibility/aria/aria-haspopup.html
++++ b/content/test/data/accessibility/aria/aria-haspopup.html
+@@ -3,7 +3,7 @@
+ @MAC-ALLOW:AXShowMenu*
+ @MAC-ALLOW:AXPress*
+ @MAC-ALLOW:AXHasPopup
+-@MAC-ALLOW:AXHasPopupValue
++@MAC-ALLOW:AXPopupValue
+ @WIN-ALLOW:EXPANDED*
+ @WIN-ALLOW:HASPOPUP*
+ @WIN-ALLOW:haspopup*
+diff --git a/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt b/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
+index 4b0bde650deed34edead37ffabd3eda2d7a82b49..38ca751991f564f9a24ba131652014f161d4b996 100644
+--- a/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
++++ b/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
+@@ -1,3 +1,3 @@
+ AXWebArea AXRoleDescription='HTML content'
+ ++AXGroup AXRoleDescription='group'
+-++++AXComboBox AXAutocompleteValue='list' AXHasPopup=1 AXHasPopupValue='listbox' AXRoleDescription='combo box'
++++++AXComboBox AXAutocompleteValue='list' AXHasPopup=1 AXPopupValue='listbox' AXRoleDescription='combo box'
+diff --git a/content/test/data/accessibility/html/input-suggestions-source-element.html b/content/test/data/accessibility/html/input-suggestions-source-element.html
+index 039ac5855e1122b34dad0c1fae42f798791b7890..d024f17de3d3b04029c532e616140e20afa87549 100644
+--- a/content/test/data/accessibility/html/input-suggestions-source-element.html
++++ b/content/test/data/accessibility/html/input-suggestions-source-element.html
+@@ -1,7 +1,7 @@
+ <!--
+ @MAC-ALLOW:AXRoleDescription
+ @MAC-ALLOW:AXHasPopup
+-@MAC-ALLOW:AXHasPopupValue
++@MAC-ALLOW:AXPopupValue
+ @WIN-ALLOW:haspopup*
+ @AURALINUX-ALLOW:haspopup*
+ @AURALINUX-ALLOW:supports-autocompletion

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 7e37891fc3d551d36d5949ed5865bd6cf4800215..9ea8f5d90f23b7255ef17f505f2b746f2f098e26 100644
+index 62ddc2d8548bcac4d55bbc7283426c426fecf254..b0eb803cd132390d492b82600d8629e2c43cc72e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -5955,6 +5955,7 @@ static_library("browser") {
+@@ -5960,6 +5960,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",

patches/chromium/crash_allow_setting_more_options.patch

@@ -75,10 +75,10 @@ index aaa9ad1d58d7f584cbf391e0cb0a61a0d25d5c69..5b02834b5ecaf4bcb7e051d9ee98cd5e
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
-index aa7c3302f2e3fc7129381b355ed4fa1bc386f8cb..d7dd05118f3c90f5ab570f59685c43bd180885e5 100644
+index eb675321436a53e82432144d43f258bed6e938e2..ae2032a12eac7c789d790e53857d11ba3e03d510 100644
 --- a/components/crash/core/app/crashpad_mac.mm
 +++ b/components/crash/core/app/crashpad_mac.mm
-@@ -71,6 +71,8 @@
+@@ -77,6 +77,8 @@
      }  // @autoreleasepool
      return process_annotations;
    }();
@@ -87,7 +87,7 @@ index aa7c3302f2e3fc7129381b355ed4fa1bc386f8cb..d7dd05118f3c90f5ab570f59685c43bd
    return annotations;
  }
  
-@@ -141,6 +143,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
+@@ -147,6 +149,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
  
        std::vector<std::string> arguments;
  

patches/chromium/crashpad-initialize-logging.patch

@@ -0,0 +1,146 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joshua Peraza <jperaza@chromium.org>
+Date: Wed, 21 Oct 2020 11:10:25 -0700
+Subject: Initialize logging for crashpad
+
+Although logging to files is not yet supported by mini_chromium, it is
+the default behavior for OS_WIN in chromium. This change should
+cause crashpad to log via OutputDebugString() on Windows, instead of
+debug.log files. Future work (crbug.com/crashpad/26) should arrange for
+logs to be uploaded with reports, embedded in associated minidumps or as
+file attachments.
+
+Bug: chromium:711159
+Change-Id: I0f9004f7de94dd29d555cc7d23c48a63da6b4bba
+Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2425108
+Reviewed-by: Mark Mentovai <mark@chromium.org>
+
+diff --git a/base/logging.cc b/base/logging.cc
+index b5cf2c4933d0cbb89f2f1b410c5c249a0b8647f0..698dca03914934b294457d05d89722a27cdebb56 100644
+--- a/base/logging.cc
++++ b/base/logging.cc
+@@ -369,21 +369,23 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
+   g_log_format = settings.log_format;
+ #endif
+ 
+-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+-  // Don't bother initializing |g_vlog_info| unless we use one of the
+-  // vlog switches.
+-  if (command_line->HasSwitch(switches::kV) ||
+-      command_line->HasSwitch(switches::kVModule)) {
+-    // NOTE: If |g_vlog_info| has already been initialized, it might be in use
+-    // by another thread. Don't delete the old VLogInfo, just create a second
+-    // one. We keep track of both to avoid memory leak warnings.
+-    CHECK(!g_vlog_info_prev);
+-    g_vlog_info_prev = g_vlog_info;
+-
+-    g_vlog_info =
+-        new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
+-                     command_line->GetSwitchValueASCII(switches::kVModule),
+-                     &g_min_log_level);
++  if (base::CommandLine::InitializedForCurrentProcess()) {
++    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
++    // Don't bother initializing |g_vlog_info| unless we use one of the
++    // vlog switches.
++    if (command_line->HasSwitch(switches::kV) ||
++        command_line->HasSwitch(switches::kVModule)) {
++      // NOTE: If |g_vlog_info| has already been initialized, it might be in use
++      // by another thread. Don't delete the old VLogInfo, just create a second
++      // one. We keep track of both to avoid memory leak warnings.
++      CHECK(!g_vlog_info_prev);
++      g_vlog_info_prev = g_vlog_info;
++
++      g_vlog_info =
++          new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
++                       command_line->GetSwitchValueASCII(switches::kVModule),
++                       &g_min_log_level);
++    }
+   }
+ 
+   g_logging_destination = settings.logging_dest;
+@@ -394,7 +396,10 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
+     config.min_severity = FX_LOG_INFO;
+     config.console_fd = -1;
+     config.log_service_channel = ZX_HANDLE_INVALID;
+-    std::string log_tag = command_line->GetProgram().BaseName().AsUTF8Unsafe();
++    std::string log_tag = base::CommandLine::ForCurrentProcess()
++                              ->GetProgram()
++                              .BaseName()
++                              .AsUTF8Unsafe();
+     const char* log_tag_data = log_tag.data();
+     config.tags = &log_tag_data;
+     config.num_tags = 1;
+diff --git a/third_party/crashpad/crashpad/DEPS b/third_party/crashpad/crashpad/DEPS
+index 83995e0cdea91522c272415330c57af764d23163..7e83327aac2582e81a38720086a52832de58a37a 100644
+--- a/third_party/crashpad/crashpad/DEPS
++++ b/third_party/crashpad/crashpad/DEPS
+@@ -42,7 +42,7 @@ deps = {
+       '7bde79cc274d06451bf65ae82c012a5d3e476b5a',
+   'crashpad/third_party/mini_chromium/mini_chromium':
+       Var('chromium_git') + '/chromium/mini_chromium@' +
+-      '76a9bb7475f6217eaf108789246379d3972b4e6a',
++      '5fc64bfbf1c000161445c586de45e40464ff2314',
+   'crashpad/third_party/libfuzzer/src':
+       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
+       'fda403cf93ecb8792cb1d061564d89a6553ca020',
+diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc
+index 33649291e253a7a9bd281b892bab415ff1950b6a..a3ba9bb17e221e8330b09eae572d116bd29e4ba4 100644
+--- a/third_party/crashpad/crashpad/handler/handler_main.cc
++++ b/third_party/crashpad/crashpad/handler/handler_main.cc
+@@ -504,16 +504,26 @@ class ScopedStoppable {
+   DISALLOW_COPY_AND_ASSIGN(ScopedStoppable);
+ };
+ 
++void InitCrashpadLogging() {
++  logging::LoggingSettings settings;
++#if defined(OS_CHROMEOS)
++  settings.logging_dest = logging::LOG_TO_FILE;
++  settings.log_file_path = "/var/log/chrome/chrome";
++#elif defined(OS_WIN)
++  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
++#else
++  settings.logging_dest =
++      logging::LOG_TO_SYSTEM_DEBUG_LOG | logging::LOG_TO_STDERR;
++#endif
++  logging::InitLogging(settings);
++}
++
+ }  // namespace
+ 
+ int HandlerMain(int argc,
+                 char* argv[],
+                 const UserStreamDataSources* user_stream_sources) {
+-#if defined(OS_CHROMEOS)
+-  if (freopen("/var/log/chrome/chrome", "a", stderr) == nullptr) {
+-    PLOG(ERROR) << "Failed to redirect stderr to /var/log/chrome/chrome";
+-  }
+-#endif
++  InitCrashpadLogging();
+ 
+   InstallCrashHandler();
+   CallMetricsRecordNormalExit metrics_record_normal_exit;
+diff --git a/third_party/crashpad/crashpad/test/gtest_main.cc b/third_party/crashpad/crashpad/test/gtest_main.cc
+index 67cfa0d72d7eb469775201f3a9df906f27c302a9..c67b8e24bb940935d5da88428ed3058a135f5a57 100644
+--- a/third_party/crashpad/crashpad/test/gtest_main.cc
++++ b/third_party/crashpad/crashpad/test/gtest_main.cc
+@@ -12,6 +12,7 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
++#include "base/logging.h"
+ #include "build/build_config.h"
+ #include "gtest/gtest.h"
+ #include "test/main_arguments.h"
+@@ -99,6 +100,12 @@ int main(int argc, char* argv[]) {
+ 
+ #endif  // CRASHPAD_IS_IN_CHROMIUM
+ 
++  // base::TestSuite initializes logging when using Chromium's test launcher.
++  logging::LoggingSettings settings;
++  settings.logging_dest =
++      logging::LOG_TO_STDERR | logging::LOG_TO_SYSTEM_DEBUG_LOG;
++  logging::InitLogging(settings);
++
+ #if defined(CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK)
+   testing::InitGoogleMock(&argc, argv);
+ #elif defined(CRASHPAD_TEST_LAUNCHER_GOOGLETEST)

patches/chromium/dcheck.patch

@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
-index 18f5da7bc5953282e72933fffd7e37bbf77bfb31..b164f15fa7506caf82f0f5f450d90dbbd88a116e 100644
+index 29fed88f36ecaf0c022d2a5a2f3ed7db66e2c96c..e1aadf680851d23cc2ce6023b20f496ee97c22da 100644
 --- a/content/browser/renderer_host/navigation_controller_impl.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl.cc
-@@ -1275,8 +1275,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
+@@ -1276,8 +1276,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
      return NAVIGATION_TYPE_NEW_SUBFRAME;
    }
  
@@ -33,7 +33,7 @@ index 18f5da7bc5953282e72933fffd7e37bbf77bfb31..b164f15fa7506caf82f0f5f450d90dbb
  
    if (rfh->GetParent()) {
      // All manual subframes would be did_create_new_entry and handled above, so
-@@ -1551,7 +1553,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
+@@ -1552,7 +1554,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
      new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
    }
  

patches/chromium/disable_color_correct_rendering.patch

@@ -35,10 +35,10 @@ index bb7ff971823db702991a3167b5b0ac1b3dd4a6c9..e5afad68300bdd6ac109b3c9b94d3c20
  
    // If we are likely to software composite the resource, we use sRGB because
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 64fe3c1c3f60758c25f9bc88daedf35633508aa7..a2e9ebb3dc31b4e8665376ffb1f805c6093bce5c 100644
+index e5a58655788be3bd1c86e238e34bbadf8012bc48..2a2de85e89a8a0f803b7c987620a259b26281d8d 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
-@@ -98,6 +98,8 @@ class CC_EXPORT LayerTreeSettings {
+@@ -99,6 +99,8 @@ class CC_EXPORT LayerTreeSettings {
    bool use_rgba_4444 = false;
    bool unpremultiply_and_dither_low_bit_depth_tiles = false;
  
@@ -229,7 +229,7 @@ index e5179c0e4971bc593860b1e5b606fec651e6756b..fc7c09d19c60d498885d3e4f1a4a4ac9
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index de4eadaf7be8be95fc0ad454d66c8ec397cfc20a..d4c451ea992490befb34b3690a98d968bb50b899 100644
+index d7439d851d6c027a20bf09a258603939b5c19f1e..72162a468f63543c508a3d34e357be1dfcdeba51 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -221,6 +221,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -327,7 +327,7 @@ index 95e818f1406eb1a73a746b73a608137ab5c6e894..6e1d3b3b1add4eda90560856b6915d46
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index 3e80dc40c83bd4eb96f9029643c4a0856253494e..8e19a78f106daf4185ee69970832ea1237d3d03b 100644
+index ec83bd814a0d5d6802b349d08b22013a0d99e015..043e769e7db9773de2054dcc66f13f062823f58f 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
 @@ -18,6 +18,7 @@
@@ -353,7 +353,7 @@ index 3e80dc40c83bd4eb96f9029643c4a0856253494e..8e19a78f106daf4185ee69970832ea12
    // Allow but ignore invalid color spaces.
    if (!color_space.IsValid())
      return true;
-@@ -265,6 +274,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
+@@ -286,6 +295,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
      DCHECK_EQ(kIOReturnSuccess, r);
    }
  

patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch

@@ -7,10 +7,10 @@ Subject:
 Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.
 
 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index 2841b7735430ca3fb03fff7a737b393a8d168747..e356bfe7fdfc11b3b1df429337cf460037788dd8 100644
+index c074f0d73eab1993b580f317c42480688e6669e6..2a86b0c6897efd10c483d0816b3f7a54f1e13d2a 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
-@@ -26,8 +26,10 @@ extern "C" {
+@@ -27,8 +27,10 @@ extern "C" {
  // descriptor. libpthread only exposes a syscall wrapper starting in
  // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
  // the syscall is issued directly.
@@ -21,7 +21,7 @@ index 2841b7735430ca3fb03fff7a737b393a8d168747..e356bfe7fdfc11b3b1df429337cf4600
  
  int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
      API_AVAILABLE(macosx(10.14));
-@@ -102,21 +104,29 @@ class PosixSpawnFileActions {
+@@ -103,21 +105,29 @@ class PosixSpawnFileActions {
  };
  
  int ChangeCurrentThreadDirectory(const char* path) {
@@ -51,7 +51,7 @@ index 2841b7735430ca3fb03fff7a737b393a8d168747..e356bfe7fdfc11b3b1df429337cf4600
  }
  
  struct GetAppOutputOptions {
-@@ -232,11 +242,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+@@ -233,11 +243,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
      file_actions.Inherit(STDERR_FILENO);
    }
  

patches/chromium/fix_properly_honor_printing_page_ranges.patch

@@ -0,0 +1,128 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Wed, 23 Sep 2020 11:16:12 -0700
+Subject: fix: properly honor printing page ranges
+
+The print ranges in Chromium's print job settings were not being properly
+plumbed through to PMPrintSettings on mcOS. This fixes that by setting
+them should they exist.
+
+diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
+index 909aaf6ce803fed32eb1c64c0abcf272731762da..ba431655fe5894c7d9b04464ea36307a145ac198 100644
+--- a/printing/printing_context_mac.h
++++ b/printing/printing_context_mac.h
+@@ -82,6 +82,10 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
+   // Returns true if the orientation was set.
+   bool SetOrientationIsLandscape(bool landscape);
+ 
++  // Set the page range in native print info object.
++  // Returns true if the range was set.
++  bool SetPrintRangeInPrintSettings(const PageRanges& ranges);
++
+   // Sets duplex mode in PMPrintSettings.
+   // Returns true if duplex mode is set.
+   bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
+diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
+index 51c8ff31497fd03842ac9e7da4eab8a5919ec898..53e11ca26e82f2eac18a3465cabde2605b061319 100644
+--- a/printing/printing_context_mac.mm
++++ b/printing/printing_context_mac.mm
+@@ -188,7 +188,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,
+         !SetCopiesInPrintSettings(settings_->copies()) ||
+         !SetCollateInPrintSettings(settings_->collate()) ||
+         !SetDuplexModeInPrintSettings(settings_->duplex_mode()) ||
+-        !SetOutputColor(static_cast<int>(settings_->color()))) {
++        !SetOutputColor(static_cast<int>(settings_->color())) ||
++        !SetPrintRangeInPrintSettings(settings_->ranges())) {
+       return OnError();
+     }
+   }
+@@ -341,6 +342,22 @@ PMPaper MatchPaper(CFArrayRef paper_list,
+   return PMSetCopies(print_settings, copies, false) == noErr;
+ }
+ 
++bool PrintingContextMac::SetPrintRangeInPrintSettings(const PageRanges& ranges) {
++  // Default is already NSPrintAllPages - we can safely bail.
++  if (ranges.empty())
++    return true; 
++
++  auto* print_settings =
++      static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
++
++  // macOS does not allow multiple ranges, so pluck the first.
++  auto range = ranges.front();
++  bool set_first_page = PMSetFirstPage(print_settings, range.from + 1, false) == noErr;
++  bool set_last_page = PMSetLastPage(print_settings, range.to + 1, false) == noErr;
++
++  return set_first_page && set_last_page;
++}
++
+ bool PrintingContextMac::SetCollateInPrintSettings(bool collate) {
+   PMPrintSettings print_settings =
+       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
+diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
+index d3c8677f30d72efc49b28f293260c74c7b8d8b4e..f6e66aaa58ab1881d64dcbb320ae8b5ac7631b28 100644
+--- a/printing/printing_context_system_dialog_win.cc
++++ b/printing/printing_context_system_dialog_win.cc
+@@ -52,14 +52,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
+   PRINTPAGERANGE ranges[32];
+   dialog_options.nStartPage = START_PAGE_GENERAL;
+   if (max_pages) {
+-    // Default initialize to print all the pages.
+     memset(ranges, 0, sizeof(ranges));
+-    ranges[0].nFromPage = 1;
+-    ranges[0].nToPage = max_pages;
+-    dialog_options.nPageRanges = 1;
+-    dialog_options.nMaxPageRanges = base::size(ranges);
++
++    auto page_ranges = settings_->ranges();
++    if (!page_ranges.empty()) {
++      for (size_t i = 0; i < page_ranges.size(); i++) {
++        auto range = page_ranges[i];
++        ranges[i].nFromPage = range.from + 1;
++        ranges[i].nToPage = range.to + 1;
++      }
++      dialog_options.nPageRanges = page_ranges.size();
++
++      // Ensure the Pages radio button is selected.
++      dialog_options.Flags |= PD_PAGENUMS;
++    } else {
++      ranges[0].nFromPage = 1;
++      ranges[0].nToPage = max_pages;
++      dialog_options.nPageRanges = 1;
++    }
++
+     dialog_options.nMinPage = 1;
+     dialog_options.nMaxPage = max_pages;
++    dialog_options.nMaxPageRanges = base::size(ranges);
+     dialog_options.lpPageRanges = ranges;
+   } else {
+     // No need to bother, we don't know how many pages are available.
+diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
+index f2ed36e1258f4f3ef1bfce972e215e3d5d7335b6..5b38bf1369a68546f0aeea8948abba995c65e7f7 100644
+--- a/ui/gtk/printing/print_dialog_gtk.cc
++++ b/ui/gtk/printing/print_dialog_gtk.cc
+@@ -239,6 +239,24 @@ void PrintDialogGtk::UpdateSettings(
+ 
+   gtk_print_settings_set_n_copies(gtk_settings_, settings->copies());
+   gtk_print_settings_set_collate(gtk_settings_, settings->collate());
++
++  auto print_ranges = settings->ranges();
++  if (!print_ranges.empty()) {
++    // Tell the system that we only intend to print a subset of pages.
++    gtk_print_settings_set_print_pages(gtk_settings_, GTK_PRINT_PAGES_RANGES);
++
++    GtkPageRange* ranges;
++    ranges = g_new(GtkPageRange, print_ranges.size());
++    for (size_t i = 0; i < print_ranges.size(); i++) {
++      auto range = print_ranges[i];
++      ranges[i].start = range.from;
++      ranges[i].end = range.to;
++    }
++
++    gtk_print_settings_set_page_ranges(gtk_settings_, ranges, 1);
++    g_free(ranges);
++  }
++
+   if (settings->dpi_horizontal() > 0 && settings->dpi_vertical() > 0) {
+     gtk_print_settings_set_resolution_xy(
+         gtk_settings_, settings->dpi_horizontal(), settings->dpi_vertical());

patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch

@@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
 to true as then Chromiums assumptions around processes become correct.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b113c265dcf5b8e3c7533085f1b8409fa13bcfa0..b80aab0f3b4a1389e6dd740d23df8f1beb051deb 100644
+index 6aa0c4db0cf1a3644a20d0fe0c7e292f3d4bbd6f..c480e16575df51cede26c83ed9455af9cb207f8c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3075,11 +3075,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
+@@ -3076,11 +3076,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
      WebContentsImpl* outermost = GetOutermostWebContents();
      if (event.button == blink::WebPointerProperties::Button::kBack &&
          outermost->controller_.CanGoBack()) {

patches/chromium/frame_host_manager.patch

@@ -42,10 +42,10 @@ index 75a58c7f56ef990e340ef271aa2d057f3541c47d..ab2679680111cfdc260c8d8dafbfae00
    // another SiteInstance for the same site.
    void RegisterSiteInstance(SiteInstanceImpl* site_instance);
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26d780a618 100644
+index e4942faa3fbf90c2819620d3f091aea59299522d..60b2b213d6429fa7cff783370cbbeff26a97a859 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -1396,6 +1396,21 @@ void NavigationRequest::BeginNavigation() {
+@@ -1397,6 +1397,21 @@ void NavigationRequest::BeginNavigation() {
      // it immediately.
      EnterChildTraceEvent("ResponseStarted", this);
  
@@ -67,7 +67,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
      // Select an appropriate RenderFrameHost.
      render_frame_host_ =
          frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
-@@ -5066,6 +5081,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
+@@ -5067,6 +5082,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
            {WILL_START_REQUEST, {
                WILL_REDIRECT_REQUEST,
                WILL_PROCESS_RESPONSE,
@@ -75,7 +75,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
                READY_TO_COMMIT,
                DID_COMMIT,
                CANCELING,
-@@ -5079,10 +5095,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
+@@ -5080,10 +5096,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
                WILL_FAIL_REQUEST,
            }},
            {WILL_PROCESS_RESPONSE, {
@@ -91,7 +91,7 @@ index ab58967aba4143d5a39f51d7bbeed0568e2fa012..102c72335f0b3e7116c982784a3b0a26
                NOT_STARTED,
                DID_COMMIT,
 diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
-index 8ed463f9f7255bdd74471d3d06c17044c68bc953..c31a9e5a4a14e2c3f745b297ebe7355383c2b8bb 100644
+index cc726282fd93048177174d91e01b7c4a3ad9fdcd..2685a56b7b1582e66d90fbc07e04462b68c59a0f 100644
 --- a/content/browser/renderer_host/navigation_request.h
 +++ b/content/browser/renderer_host/navigation_request.h
 @@ -129,6 +129,10 @@ class CONTENT_EXPORT NavigationRequest
@@ -255,7 +255,7 @@ index cafd45df059293bc1cf31e1d7b798e67578f3e9d..c196b783fe0a43bfee98253afe8461a0
      const MainFunctionParams& parameters) {
    return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 9953cc472c04c2dc6ae0f70b64ea2b8d6ac86a05..5200555594d41f52bcf208b55c346323d7017b81 100644
+index 3b93afa004fb4d56ade2ab16147b42f26e90e3db..9156388fda045775145302f2c7fd810b0f61bd84 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -253,8 +253,45 @@ class CONTENT_EXPORT ContentBrowserClient {

patches/chromium/gin_enable_disable_v8_platform.patch

@@ -38,10 +38,10 @@ index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632b
    v8::Isolate* isolate() { return isolate_; }
  
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 9ba60a7f928a24b4829dafdf9a7362ad58bd7c64..51fe2fa000e47ced3661ba581c52dceba93447fe 100644
+index 4174fd98f3a1d9ed6c9a4b57651e8122a2d37770..07d970b84b770b06019dc1de441cf108d67b1782 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -191,12 +191,14 @@ enum LoadV8FileResult {
+@@ -198,12 +198,14 @@ enum LoadV8FileResult {
  }  // namespace
  
  // static

patches/chromium/gpu_notify_when_dxdiag_request_fails.patch

@@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index 694f63ecd2de241fd1a8b7b529bbd4d1bea78337..cc9679eb86f85239f5612d8db8200db5392f5bc5 100644
+index 1f36d0320040b318c8f8611253ddffb2749e3dc3..15bcff79b7d416366b1d1dc187c966466a2eacb7 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
 @@ -229,6 +229,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -28,7 +28,7 @@ index 694f63ecd2de241fd1a8b7b529bbd4d1bea78337..cc9679eb86f85239f5612d8db8200db5
  
  void GpuDataManagerImpl::UpdateGpuFeatureInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index 7030549c94196877b690e8f683dda212534176ec..e9b216f65394e36525533768e087cd367d7bfaae 100644
+index ef04f1bf4a009c3e6c4fe0cb2d3393ca9bbcef16..1640de1fbcbbf6904b9aaac7b8f6a58feda8ead6 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
 @@ -97,6 +97,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
@@ -56,7 +56,7 @@ index 879e233fa550b3aad94b64fb1ac603cbae782922..cecf9738c6e33c766fcadea8c71b6656
  
  void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index 27b517d56af0c687c15b7e2d2db37798b63df3e8..aa92f8b6e12c762cdb81090d072c76742ac9489c 100644
+index 73b6c034e382e52dbcb951ee8d783575f01fe451..5d1d8a6bc719c4c9c71e6bce40c50cdfbedf4634 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
 @@ -75,6 +75,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {

patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch

@@ -43,10 +43,10 @@ index 19d7421e1de9680a8b1364f010e19cc95ef7325a..b213e28a6a475d003892117c0a64c70b
  
  void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) {
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2e32ddda8980ed760e46e73e01c69c548e77b7b6..2927f0b9ce03a0567a460698903d17d62fc42c95 100644
+index 2894425cecf01849928cffeb3b5a565741f303f1..53aa670f317249da6a39dee60ec3a9f02baa5e61 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4270,6 +4270,12 @@ bool WebContentsImpl::OnUpdateDragCursor() {
+@@ -4279,6 +4279,12 @@ bool WebContentsImpl::OnUpdateDragCursor() {
           browser_plugin_embedder_->OnUpdateDragCursor();
  }
  

patches/chromium/rename_the_v8_context_snapshot_on_arm64_macos_builds.patch

@@ -1,214 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Wed, 21 Oct 2020 13:13:00 -0700
-Subject: rename the v8 context snapshot on arm64 macOS builds
-
-This is done so that the arm64 and x64 v8 context snapshots can
-live side by side in a universal app build of a Chromium based
-application.  All other files can be Mach-O universal binaries
-generated using "lipo" but these snapshot files have to be uniquely
-named so that both can exist in the Resources folder at the same time
-and the correct one is chosen at runtime.
-
-Bug: 1142017
-Change-Id: I8449b72ba3a36e7ce69b9d9ec7768bd80ecc3e3a
-
-diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
-index a07040de159b5a060c30cc5d9b16c82686f12363..c616d7cd872349d8ead7d6605b437d7330a22034 100644
---- a/android_webview/BUILD.gn
-+++ b/android_webview/BUILD.gn
-@@ -792,7 +792,7 @@ if (android_64bit_target_cpu) {
-            "32-bit targets shouldn't have secondary abi")
-     arch_suffix = "32"
-     if (use_v8_context_snapshot) {
--      renaming_sources = [ "$_secondary_abi_out_dir/v8_context_snapshot.bin" ]
-+      renaming_sources = [ "$_secondary_abi_out_dir/$v8_context_snapshot_filename" ]
-       renaming_destinations = [ "v8_context_snapshot_$arch_suffix.bin" ]
-     } else {
-       renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
-diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 56f5ff4c628daa7f42f4c84c9a4b98f3f250a2b0..15f7a164662b9e90fa43eb893d743182e05b48fa 100644
---- a/chrome/BUILD.gn
-+++ b/chrome/BUILD.gn
-@@ -772,7 +772,7 @@ if (is_win) {
-     if (v8_use_external_startup_data) {
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
--        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
-+        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-         public_deps += [ "//tools/v8_context_snapshot" ]
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index 7c7af8c0d9487abcd82ecd9d2d5b1ab4b737148b..df39ea145cc6b05775db7fbfb680fce892b8941a 100644
---- a/chrome/installer/mini_installer/BUILD.gn
-+++ b/chrome/installer/mini_installer/BUILD.gn
-@@ -228,7 +228,7 @@ template("generate_mini_installer") {
-     if (v8_use_external_startup_data) {
-       deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
--        inputs += [ "$root_out_dir/v8_context_snapshot.bin" ]
-+        inputs += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-         deps += [ "//tools/v8_context_snapshot" ]
-       } else {
-         inputs += [ "$root_out_dir/snapshot_blob.bin" ]
-diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index fcf6229f4d530c56b7c65fe6898c00a8a566dc1a..b3115bab5c08106072e28a9f01304f688d51f72b 100644
---- a/content/browser/BUILD.gn
-+++ b/content/browser/BUILD.gn
-@@ -43,6 +43,7 @@ source_set("browser") {
-   configs += [
-     "//build/config:precompiled_headers",
-     "//content:content_implementation",
-+    "//tools/v8_context_snapshot:use_v8_context_snapshot",
-     "//v8:external_startup_data",
-   ]
-   defines = []
-diff --git a/content/browser/v8_snapshot_files.cc b/content/browser/v8_snapshot_files.cc
-index d557c41a38e17c61e1b91d3daa47ea17e13a6a9e..43c93e3f50290d2aef230083a4bcebf307ef0c6e 100644
---- a/content/browser/v8_snapshot_files.cc
-+++ b/content/browser/v8_snapshot_files.cc
-@@ -13,7 +13,7 @@ std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() {
- #if defined(OS_LINUX) || defined(OS_CHROMEOS)
- #if defined(USE_V8_CONTEXT_SNAPSHOT)
-   return {{kV8ContextSnapshotDataDescriptor,
--           base::FilePath(FILE_PATH_LITERAL("v8_context_snapshot.bin"))}};
-+           base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}};
- #else
-   return {{kV8SnapshotDataDescriptor,
-            base::FilePath(FILE_PATH_LITERAL("snapshot_blob.bin"))}};
-diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
-index 578e4341247e112440b13080b45ac5e854635bd2..74c1e0f29db065985920756ae057e255d76e51c2 100644
---- a/content/shell/BUILD.gn
-+++ b/content/shell/BUILD.gn
-@@ -547,7 +547,7 @@ if (is_mac) {
-     if (v8_use_external_startup_data) {
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
--        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
-+        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-         public_deps += [ "//tools/v8_context_snapshot" ]
-       } else {
-         sources += [ "$root_out_dir/snapshot_blob.bin" ]
-diff --git a/gin/BUILD.gn b/gin/BUILD.gn
-index 9ec6eb1b898bc87d066bdc75867ff624f7ef1f50..dfc59c17382f8463e82185032d977a1868c71985 100644
---- a/gin/BUILD.gn
-+++ b/gin/BUILD.gn
-@@ -85,7 +85,10 @@ component("gin") {
-     frameworks = [ "CoreFoundation.framework" ]
-   }
- 
--  configs += [ "//v8:external_startup_data" ]
-+  configs += [
-+    "//tools/v8_context_snapshot:use_v8_context_snapshot",
-+    "//v8:external_startup_data",
-+  ]
- }
- 
- executable("gin_shell") {
-diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 51fe2fa000e47ced3661ba581c52dceba93447fe..07d970b84b770b06019dc1de441cf108d67b1782 100644
---- a/gin/v8_initializer.cc
-+++ b/gin/v8_initializer.cc
-@@ -76,7 +76,9 @@ const char kSnapshotFileName32[] = "snapshot_blob_32.bin";
- #endif
- 
- #else  // defined(OS_ANDROID)
--const char kV8ContextSnapshotFileName[] = "v8_context_snapshot.bin";
-+#if defined(USE_V8_CONTEXT_SNAPSHOT)
-+const char kV8ContextSnapshotFileName[] = V8_CONTEXT_SNAPSHOT_FILENAME;
-+#endif
- const char kSnapshotFileName[] = "snapshot_blob.bin";
- #endif  // defined(OS_ANDROID)
- 
-@@ -86,7 +88,12 @@ const char* GetSnapshotFileName(
-     case V8Initializer::V8SnapshotFileType::kDefault:
-       return kSnapshotFileName;
-     case V8Initializer::V8SnapshotFileType::kWithAdditionalContext:
-+#if defined(USE_V8_CONTEXT_SNAPSHOT)
-       return kV8ContextSnapshotFileName;
-+#else
-+      NOTREACHED();
-+      return nullptr;
-+#endif
-   }
-   NOTREACHED();
-   return nullptr;
-diff --git a/headless/BUILD.gn b/headless/BUILD.gn
-index aeab3dc3ad08688b7a7af191b43e20845da72091..d2ab76aed326d246c8f8d550ff709b84b56e45d3 100644
---- a/headless/BUILD.gn
-+++ b/headless/BUILD.gn
-@@ -471,7 +471,7 @@ component("headless_non_renderer") {
-     if (v8_use_external_startup_data) {
-       public_deps += [ "//v8" ]
-       if (use_v8_context_snapshot) {
--        data += [ "$root_out_dir/v8_context_snapshot.bin" ]
-+        data += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-         data_deps += [ "//tools/v8_context_snapshot" ]
-       } else {
-         data += [ "$root_out_dir/snapshot_blob.bin" ]
-diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index 2f20f684d89021dcd0e64421a0553a3e4a66334d..7662cc8ee83e39709eee6e0919c85370fedbb983 100644
---- a/tools/v8_context_snapshot/BUILD.gn
-+++ b/tools/v8_context_snapshot/BUILD.gn
-@@ -21,14 +21,17 @@ group("v8_context_snapshot") {
-   if (use_v8_context_snapshot) {
-     public_deps = [ ":generate_v8_context_snapshot" ]
-     if (!is_android) {
--      data = [ "$root_out_dir/v8_context_snapshot.bin" ]
-+      data = [ "$root_out_dir/$v8_context_snapshot_filename" ]
-     }
-   }
- }
- 
- config("use_v8_context_snapshot") {
-   if (use_v8_context_snapshot) {
--    defines = [ "USE_V8_CONTEXT_SNAPSHOT" ]
-+    defines = [
-+      "USE_V8_CONTEXT_SNAPSHOT",
-+      "V8_CONTEXT_SNAPSHOT_FILENAME=\"$v8_context_snapshot_filename\"",
-+    ]
-   }
- }
- 
-@@ -36,7 +39,7 @@ if (use_v8_context_snapshot) {
-   if (is_android && enable_java_templates) {
-     android_assets("v8_context_snapshot_assets") {
-       deps = [ ":v8_context_snapshot" ]
--      renaming_sources = [ "$root_out_dir/v8_context_snapshot.bin" ]
-+      renaming_sources = [ "$root_out_dir/$v8_context_snapshot_filename" ]
-       if (current_cpu == "arm" || current_cpu == "x86" ||
-           current_cpu == "mipsel") {
-         renaming_destinations = [ "v8_context_snapshot_32.bin" ]
-@@ -49,7 +52,7 @@ if (use_v8_context_snapshot) {
- 
-   action("generate_v8_context_snapshot") {
-     script = "//build/gn_run_binary.py"
--    output_file = "$root_out_dir/v8_context_snapshot.bin"
-+    output_file = "$root_out_dir/$v8_context_snapshot_filename"
-     output_path = rebase_path(output_file, root_build_dir)
- 
-     args = [
-diff --git a/tools/v8_context_snapshot/v8_context_snapshot.gni b/tools/v8_context_snapshot/v8_context_snapshot.gni
-index 6a6f477ad3f543680cd6485bdf6b0e82d567012c..7f485e135cef8e3f0c01ede28b4cfe76067bc624 100644
---- a/tools/v8_context_snapshot/v8_context_snapshot.gni
-+++ b/tools/v8_context_snapshot/v8_context_snapshot.gni
-@@ -18,6 +18,18 @@ declare_args() {
-       !is_chromeos && !is_android && !is_chromecast && !is_fuchsia &&
-       !(host_os == "mac" && current_cpu == "x86") &&
-       (v8_target_cpu == target_cpu || is_msan) && !(is_win && host_os != "win")
-+
-+  # We use a different filename for arm64 macOS builds so that the arm64 and
-+  # x64 snapshots can live side-by-side in a universal macOS app.
-+  if (is_mac) {
-+    if (v8_target_cpu == "x64") {
-+      v8_context_snapshot_filename = "v8_context_snapshot.x86_64.bin"
-+    } else if (v8_target_cpu == "arm64") {
-+      v8_context_snapshot_filename = "v8_context_snapshot.arm64.bin"
-+    }
-+  } else {
-+    v8_context_snapshot_filename = "v8_context_snapshot.bin"
-+  }
- }
- 
- # We cannot use V8 context snapshot, if V8 doesn't use snapshot files.

patches/chromium/render_widget_host_view_mac.patch

@@ -10,10 +10,10 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index eae6d8c330a523e85c7997e59091be0ce42031dc..3f23af8dca0d8a1fa149877cde1a553360610eba 100644
+index eae6d8c330a523e85c7997e59091be0ce42031dc..d90f13139cfc9291c76824a6529e2931176d1079 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-@@ -154,6 +154,11 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -154,6 +154,15 @@ void ExtractUnderlines(NSAttributedString* string,
  
  }  // namespace
  
@@ -21,11 +21,15 @@ index eae6d8c330a523e85c7997e59091be0ce42031dc..3f23af8dca0d8a1fa149877cde1a5533
 +- (BOOL)acceptsFirstMouse;
 +- (BOOL)disableAutoHideCursor;
 +@end
++
++@interface NSView (ElectronCustomMethods)
++- (BOOL)shouldIgnoreMouseEvent;
++@end
 +
  // These are not documented, so use only after checking -respondsToSelector:.
  @interface NSApplication (UndocumentedSpeechMethods)
  - (void)speakString:(NSString*)string;
-@@ -573,6 +578,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+@@ -573,6 +582,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -35,7 +39,18 @@ index eae6d8c330a523e85c7997e59091be0ce42031dc..3f23af8dca0d8a1fa149877cde1a5533
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -996,6 +1004,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -648,6 +660,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+   // its parent view.
+   BOOL hitSelf = NO;
+   while (view) {
++    if ([view respondsToSelector:@selector(shouldIgnoreMouseEvent)] && ![view shouldIgnoreMouseEvent]) {
++      return NO;
++    }
++
+     if (view == self)
+       hitSelf = YES;
+     if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
+@@ -996,6 +1012,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSKeyDown &&
                                !(modifierFlags & NSCommandKeyMask);
  
@@ -46,7 +61,7 @@ index eae6d8c330a523e85c7997e59091be0ce42031dc..3f23af8dca0d8a1fa149877cde1a5533
    // We only handle key down events and just simply forward other events.
    if (eventType != NSKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1772,9 +1784,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1772,9 +1792,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -58,7 +73,7 @@ index eae6d8c330a523e85c7997e59091be0ce42031dc..3f23af8dca0d8a1fa149877cde1a5533
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1783,7 +1797,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1783,7 +1805,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,

patches/chromium/resource_file_conflict.patch

@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index bfaf61fe2622812724617267bfe099bb9608dfff..56f5ff4c628daa7f42f4c84c9a4b98f3f250a2b0 100644
+index 7913e9c6bd0a275543b2183761134826aa14a5c8..1a4a98c25b39b5879c19f999dfd680141500ef09 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1434,7 +1434,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1437,7 +1437,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index bfaf61fe2622812724617267bfe099bb9608dfff..56f5ff4c628daa7f42f4c84c9a4b98f3
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1454,6 +1454,12 @@ if (!is_android) {
+@@ -1457,6 +1457,12 @@ if (!is_android) {
    }
  }
  

patches/chromium/revert_remove_contentrendererclient_shouldfork.patch

@@ -92,10 +92,10 @@ index 541fb915a2096a6ea56860662fff9f1dec9929cf..e4637fc393bafcdeac62cd4257f42451
    // |url|. If the function returns a valid |new_url|, the request must be
    // updated to use it. The |force_ignore_site_for_cookies| output parameter
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 5eb2dcde4d2033015677681ceeba7da9b9fe32df..6b3177a36bcd47192c967562d72bee02fb9ebc81 100644
+index 23ff9cc13aaa97d395983dceb2a27158b2d679a5..d6ca9930c8c8caacac4e3d7f8a65189349589464 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -5797,6 +5797,23 @@ void RenderFrameImpl::BeginNavigation(
+@@ -5799,6 +5799,23 @@ void RenderFrameImpl::BeginNavigation(
      // we can do a per-frame check here rather than a process-wide check.
      bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
                         (enabled_bindings_ & kWebUIBindingsPolicyMask);

patches/chromium/scroll_bounce_flag.patch

@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 91daa69bf55a0e3bcc0b67699b975efcba91aaa9..78b72a1a138077fea7555e960f84bce706b22352 100644
+index 6fae8670bf01df2bde39ddbfa0ee515453fc8c0b..89129af39c4f3e9cacca5f78b2682b96cd341d09 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1318,7 +1318,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1314,7 +1314,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {

patches/chromium/use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Tue, 17 Nov 2020 16:59:28 -0800
+Subject: use public APIs to determine if a font is a system font in MAS build
+
+CTFontDescriptorIsSystemUIFont is a private API, we're using an _interesting_ technique in the MAS build to determine if the font is a system font by checking if it's kCTFontPriorityAttribute is set to system priority.
+
+diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
+index fc6047806e3511f60b58a669fdf628e1a48eb05b..bcc29ac87cfc965eb4c3f06d959605d2cb259770 100644
+--- a/ui/gfx/platform_font_mac.mm
++++ b/ui/gfx/platform_font_mac.mm
+@@ -25,9 +25,11 @@
+ 
+ using Weight = Font::Weight;
+ 
++#if !defined(MAS_BUILD)
+ extern "C" {
+ bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
+ }
++#endif
+ 
+ namespace {
+ 
+@@ -269,7 +271,13 @@ NSInteger ToNSFontManagerWeight(Weight weight) {
+   // TODO(avi, etienneb): Figure out this font stuff.
+   base::ScopedCFTypeRef<CTFontDescriptorRef> descriptor(
+       CTFontCopyFontDescriptor(font));
++#if defined(MAS_BUILD)
++  CFNumberRef priority = (CFNumberRef)CTFontDescriptorCopyAttribute(descriptor.get(), (CFStringRef)kCTFontPriorityAttribute);
++  SInt64 v;
++  if (CFNumberGetValue(priority, kCFNumberSInt64Type, &v) && v == kCTFontPrioritySystem) {
++#else
+   if (CTFontDescriptorIsSystemUIFont(descriptor.get())) {
++#endif
+     // Assume it's the standard system font. The fact that this much is known is
+     // enough.
+     return PlatformFontMac::SystemFontType::kGeneral;

patches/chromium/v8_context_snapshot_generator.patch

@@ -7,10 +7,10 @@ v8_context_snapshot_generator is a build time executable.
 The patch adds the config.
 
 diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index 7728ccccee97e747d476500baf0ae46a52b66ae3..2f20f684d89021dcd0e64421a0553a3e4a66334d 100644
+index c238e7e3837e0ee521374045b28340a8fc223a7d..7662cc8ee83e39709eee6e0919c85370fedbb983 100644
 --- a/tools/v8_context_snapshot/BUILD.gn
 +++ b/tools/v8_context_snapshot/BUILD.gn
-@@ -112,6 +112,7 @@ if (use_v8_context_snapshot) {
+@@ -115,6 +115,7 @@ if (use_v8_context_snapshot) {
      configs += [
        "//v8:external_startup_data",
        ":disable_icf",

patches/chromium/web_contents.patch

@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b80aab0f3b4a1389e6dd740d23df8f1beb051deb..2e32ddda8980ed760e46e73e01c69c548e77b7b6 100644
+index c480e16575df51cede26c83ed9455af9cb207f8c..2894425cecf01849928cffeb3b5a565741f303f1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2770,6 +2770,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2771,6 +2771,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
    std::string unique_name;
    frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
  
@@ -25,7 +25,7 @@ index b80aab0f3b4a1389e6dd740d23df8f1beb051deb..2e32ddda8980ed760e46e73e01c69c54
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2780,6 +2786,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2781,6 +2787,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }

patches/v8/build_gn.patch

@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 704ed28caa59eb6159baa2be4f6f94d62db74c16..8bdb2718008eed2a04a916253850a76b5eff8c96 100644
+index 94b598bc9a2882c1a47fad6d2c47068b472ecb6c..128271ee0305baef31001894a163beff98bcdd6a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -411,7 +411,7 @@ config("internal_config") {
+@@ -410,7 +410,7 @@ config("internal_config") {
      ":v8_header_features",
    ]
  
@@ -21,7 +21,7 @@ index 704ed28caa59eb6159baa2be4f6f94d62db74c16..8bdb2718008eed2a04a916253850a76b
      defines += [ "BUILDING_V8_SHARED" ]
    }
  }
-@@ -4478,7 +4478,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -4477,7 +4477,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 704ed28caa59eb6159baa2be4f6f94d62db74c16..8bdb2718008eed2a04a916253850a76b
  
      deps = [
        ":v8_libbase",
-@@ -4515,6 +4515,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -4514,6 +4514,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  

patches/v8/do_not_export_private_v8_symbols_on_windows.patch

@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index da035d3afac94617d163197156dc2871be6c4be3..07fd11838469c4296f50d21a5f7941570293cd58 100644
+index 6197ec36eb4c2ee3047334be243633ad5e866506..80ad800fa986e616896b782701fe9eb0ba2a0baa 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -411,6 +411,10 @@ config("internal_config") {
+@@ -410,6 +410,10 @@ config("internal_config") {
      ":v8_header_features",
    ]
  

patches/v8/expose_mksnapshot.patch

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 8bdb2718008eed2a04a916253850a76b5eff8c96..da035d3afac94617d163197156dc2871be6c4be3 100644
+index 128271ee0305baef31001894a163beff98bcdd6a..6197ec36eb4c2ee3047334be243633ad5e866506 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -4489,7 +4489,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -4488,7 +4488,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {

script/push-patch.js

@@ -0,0 +1,41 @@
+const { createAppAuth } = require('@octokit/auth-app');
+const cp = require('child_process');
+
+if (!process.env.CIRCLE_BRANCH) {
+  console.error('Not building for a specific branch, can\'t autopush a patch');
+  process.exit(1);
+}
+
+if (process.env.CIRCLE_PR_NUMBER) {
+  console.error('Building for a forked PR, can\'t autopush a patch');
+  process.exit(1);
+}
+
+const auth = createAppAuth({
+  appId: process.env.PATCH_UP_APP_ID,
+  privateKey: Buffer.from(process.env.PATCH_UP_PRIVATE_KEY, 'base64').toString('utf8'),
+  installationId: process.env.PATCH_UP_INSTALLATION_ID,
+  clientId: process.env.PATCH_UP_CLIENT_ID,
+  clientSecret: process.env.PATCH_UP_CLIENT_SECRET
+});
+
+async function main () {
+  const installationAuth = await auth({ type: 'installation' });
+  const remoteURL = `https://x-access-token:${installationAuth.token}@github.com/electron/electron.git`;
+  // NEVER LOG THE OUTPUT OF THIS COMMAND
+  // GIT LEAKS THE ACCESS CREDENTIALS IN CONSOLE LOGS
+  const { status } = cp.spawnSync('git', ['push', '--set-upstream', remoteURL], {
+    stdio: 'ignore'
+  });
+  if (status !== 0) {
+    console.error('Failed to push to target branch');
+    process.exit(1);
+  }
+}
+
+if (process.mainModule === module) {
+  main().catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
+}

script/release/uploaders/upload-to-github.js

@@ -51,7 +51,7 @@ function uploadToGitHub () {
       console.log(`Error uploading ${fileName} to GitHub, will retry.  Error was:`, err);
       retry++;
 
-      octokit.repos.listAssetsForRelease({
+      octokit.repos.listReleaseAssets({
         owner: 'electron',
         repo: targetRepo,
         release_id: releaseId,

script/release/uploaders/upload.py

@@ -20,7 +20,7 @@ sys.path.append(
 from io import StringIO
 from zipfile import ZipFile
 from lib.config import PLATFORM, get_target_arch,  get_env_var, s3_config, \
-                       get_zip_name
+                       get_zip_name, enable_verbose_mode, get_platform_key
 from lib.util import get_electron_branding, execute, get_electron_version, \
                      scoped_cwd, s3put, get_electron_exec, \
                      get_out_dir, SRC_DIR, ELECTRON_DIR
@@ -44,7 +44,9 @@ TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'toolchain
 
 def main():
   args = parse_args()
-  if  args.upload_to_s3:
+  if args.verbose:
+    enable_verbose_mode()
+  if args.upload_to_s3:
     utcnow = datetime.datetime.utcnow()
     args.upload_timestamp = utcnow.strftime('%Y%m%d')
 
@@ -76,11 +78,13 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
     upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
-    api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
-    upload_electron(release, api_path, args)
+    if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
+      api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
+      upload_electron(release, api_path, args)
+
+      ts_defs_path = os.path.join(ELECTRON_DIR, 'electron.d.ts')
+      upload_electron(release, ts_defs_path, args)
 
-    ts_defs_path = os.path.join(ELECTRON_DIR, 'electron.d.ts')
-    upload_electron(release, ts_defs_path, args)
     dsym_zip = os.path.join(OUT_DIR, DSYM_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
@@ -149,6 +153,9 @@ def parse_args():
                       action='store_true',
                       default=False,
                       required=False)
+  parser.add_argument('--verbose',
+                      action='store_true',
+                      help='Mooooorreee logs')
   return parser.parse_args()
 
 

shell/app/resources/mac/loginhelper-Info.plist

@@ -12,7 +12,5 @@
 	<string>APPL</string>
 	<key>LSBackgroundOnly</key>
 	<true/>
-	<key>LSRequiresNativeExecution</key>
-	<true/>
 </dict>
 </plist>

shell/browser/api/electron_api_app.cc

@@ -536,10 +536,10 @@ void OnClientCertificateSelected(
       data.c_str(), data.length(), net::X509Certificate::FORMAT_AUTO);
   if (!certs.empty()) {
     scoped_refptr<net::X509Certificate> cert(certs[0].get());
-    for (size_t i = 0; i < identities->size(); ++i) {
-      if (cert->EqualsExcludingChain((*identities)[i]->certificate())) {
+    for (auto& identity : *identities) {
+      if (cert->EqualsExcludingChain(identity->certificate())) {
         net::ClientCertIdentity::SelfOwningAcquirePrivateKey(
-            std::move((*identities)[i]),
+            std::move(identity),
             base::BindRepeating(&GotPrivateKey, delegate, std::move(cert)));
         break;
       }
@@ -1659,6 +1659,8 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
 #endif
 #if defined(OS_MAC)
       .SetProperty("dock", &App::GetDockAPI)
+      .SetProperty("runningUnderRosettaTranslation",
+                   &App::IsRunningUnderRosettaTranslation)
 #endif
       .SetProperty("userAgentFallback", &App::GetUserAgentFallback,
                    &App::SetUserAgentFallback)

shell/browser/api/electron_api_app.h

@@ -220,6 +220,7 @@ class App : public ElectronBrowserClient::Delegate,
   bool MoveToApplicationsFolder(gin_helper::ErrorThrower, gin::Arguments* args);
   bool IsInApplicationsFolder();
   v8::Local<v8::Value> GetDockAPI(v8::Isolate* isolate);
+  bool IsRunningUnderRosettaTranslation() const;
   v8::Global<v8::Value> dock_;
 #endif
 

shell/browser/api/electron_api_app_mac.mm

@@ -9,6 +9,7 @@
 #include "shell/common/electron_paths.h"
 
 #import <Cocoa/Cocoa.h>
+#import <sys/sysctl.h>
 
 namespace electron {
 
@@ -58,6 +59,16 @@ void App::SetActivationPolicy(gin_helper::ErrorThrower thrower,
   [NSApp setActivationPolicy:activation_policy];
 }
 
+bool App::IsRunningUnderRosettaTranslation() const {
+  int proc_translated = 0;
+  size_t size = sizeof(proc_translated);
+  if (sysctlbyname("sysctl.proc_translated", &proc_translated, &size, NULL,
+                   0) == -1) {
+    return false;
+  }
+  return proc_translated == 1;
+}
+
 }  // namespace api
 
 }  // namespace electron

shell/browser/api/electron_api_base_window.cc

@@ -222,6 +222,10 @@ void BaseWindow::OnWindowResize() {
   Emit("resize");
 }
 
+void BaseWindow::OnWindowResized() {
+  Emit("resized");
+}
+
 void BaseWindow::OnWindowWillMove(const gfx::Rect& new_bounds,
                                   bool* prevent_default) {
   if (Emit("will-move", new_bounds)) {

shell/browser/api/electron_api_base_window.h

@@ -63,6 +63,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void OnWindowWillResize(const gfx::Rect& new_bounds,
                           bool* prevent_default) override;
   void OnWindowResize() override;
+  void OnWindowResized() override;
   void OnWindowWillMove(const gfx::Rect& new_bounds,
                         bool* prevent_default) override;
   void OnWindowMove() override;

shell/browser/api/electron_api_browser_view.cc

@@ -4,9 +4,12 @@
 
 #include "shell/browser/api/electron_api_browser_view.h"
 
+#include <vector>
+
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_browser_view.h"
+#include "shell/browser/ui/drag_util.h"
 #include "shell/common/color_util.h"
 #include "shell/common/gin_converters/gfx_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
@@ -80,6 +83,7 @@ BrowserView::BrowserView(gin::Arguments* args,
 
   web_contents_.Reset(isolate, web_contents.ToV8());
   api_web_contents_ = web_contents.get();
+  api_web_contents_->AddObserver(this);
   Observe(web_contents->web_contents());
 
   view_.reset(
@@ -90,6 +94,7 @@ BrowserView::~BrowserView() {
   if (api_web_contents_) {  // destroy() is called
     // Destroy WebContents asynchronously unless app is shutting down,
     // because destroy() might be called inside WebContents's event handler.
+    api_web_contents_->RemoveObserver(this);
     api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down());
   }
 }
@@ -100,6 +105,11 @@ void BrowserView::WebContentsDestroyed() {
   Unpin();
 }
 
+void BrowserView::OnDraggableRegionsUpdated(
+    const std::vector<mojom::DraggableRegionPtr>& regions) {
+  view_->UpdateDraggableRegions(regions);
+}
+
 // static
 gin::Handle<BrowserView> BrowserView::New(gin_helper::ErrorThrower thrower,
                                           gin::Arguments* args) {

shell/browser/api/electron_api_browser_view.h

@@ -7,11 +7,14 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "content/public/browser/web_contents_observer.h"
 #include "gin/handle.h"
 #include "gin/wrappable.h"
+#include "shell/browser/extended_web_contents_observer.h"
 #include "shell/browser/native_browser_view.h"
+#include "shell/common/api/api.mojom.h"
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/pinnable.h"
@@ -35,7 +38,8 @@ class WebContents;
 class BrowserView : public gin::Wrappable<BrowserView>,
                     public gin_helper::Constructible<BrowserView>,
                     public gin_helper::Pinnable<BrowserView>,
-                    public content::WebContentsObserver {
+                    public content::WebContentsObserver,
+                    public ExtendedWebContentsObserver {
  public:
   // gin_helper::Constructible
   static gin::Handle<BrowserView> New(gin_helper::ErrorThrower thrower,
@@ -59,6 +63,10 @@ class BrowserView : public gin::Wrappable<BrowserView>,
   // content::WebContentsObserver:
   void WebContentsDestroyed() override;
 
+  // ExtendedWebContentsObserver:
+  void OnDraggableRegionsUpdated(
+      const std::vector<mojom::DraggableRegionPtr>& regions) override;
+
  private:
   void SetAutoResize(AutoResizeFlags flags);
   void SetBounds(const gfx::Rect& bounds);

shell/browser/api/electron_api_browser_window.cc

@@ -14,6 +14,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "shell/browser/api/electron_api_web_contents_view.h"
 #include "shell/browser/browser.h"
+#include "shell/browser/native_browser_view.h"
 #include "shell/browser/unresponsive_suppressor.h"
 #include "shell/browser/web_contents_preferences.h"
 #include "shell/browser/window_list.h"
@@ -304,8 +305,15 @@ void BrowserWindow::OnWindowIsKeyChanged(bool is_key) {
 
 void BrowserWindow::OnWindowResize() {
 #if defined(OS_MAC)
-  if (!draggable_regions_.empty())
+  if (!draggable_regions_.empty()) {
     UpdateDraggableRegions(draggable_regions_);
+  } else {
+    // Ensure draggable bounds are recalculated for BrowserViews if any exist.
+    auto browser_views = window_->browser_views();
+    for (NativeBrowserView* view : browser_views) {
+      view->UpdateDraggableRegions(draggable_regions_);
+    }
+  }
 #endif
   BaseWindow::OnWindowResize();
 }
@@ -414,19 +422,6 @@ v8::Local<v8::Value> BrowserWindow::GetWebContents(v8::Isolate* isolate) {
   return v8::Local<v8::Value>::New(isolate, web_contents_);
 }
 
-// Convert draggable regions in raw format to SkRegion format.
-std::unique_ptr<SkRegion> BrowserWindow::DraggableRegionsToSkRegion(
-    const std::vector<mojom::DraggableRegionPtr>& regions) {
-  auto sk_region = std::make_unique<SkRegion>();
-  for (const auto& region : regions) {
-    sk_region->op(
-        {region->bounds.x(), region->bounds.y(), region->bounds.right(),
-         region->bounds.bottom()},
-        region->draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
-  }
-  return sk_region;
-}
-
 void BrowserWindow::ScheduleUnresponsiveEvent(int ms) {
   if (!window_unresponsive_closure_.IsCancelled())
     return;

shell/browser/api/electron_api_browser_window.h

@@ -12,6 +12,7 @@
 #include "base/cancelable_callback.h"
 #include "shell/browser/api/electron_api_base_window.h"
 #include "shell/browser/api/electron_api_web_contents.h"
+#include "shell/browser/ui/drag_util.h"
 #include "shell/common/gin_helper/error_thrower.h"
 
 namespace electron {
@@ -62,6 +63,9 @@ class BrowserWindow : public BaseWindow,
   void OnActivateContents() override;
   void OnPageTitleUpdated(const base::string16& title,
                           bool explicit_set) override;
+#if defined(OS_MAC)
+  void OnDevToolsResized() override;
+#endif
 
   // NativeWindowObserver:
   void RequestPreferredWidth(int* width) override;
@@ -102,10 +106,6 @@ class BrowserWindow : public BaseWindow,
   void UpdateDraggableRegions(
       const std::vector<mojom::DraggableRegionPtr>& regions);
 
-  // Convert draggable regions in raw format to SkRegion format.
-  std::unique_ptr<SkRegion> DraggableRegionsToSkRegion(
-      const std::vector<mojom::DraggableRegionPtr>& regions);
-
   // Schedule a notification unresponsive event.
   void ScheduleUnresponsiveEvent(int ms);
 

shell/browser/api/electron_api_browser_window_mac.mm

@@ -12,51 +12,13 @@
 #include "base/mac/scoped_nsobject.h"
 #include "shell/browser/native_browser_view.h"
 #include "shell/browser/native_window_mac.h"
+#include "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h"
 #include "shell/browser/ui/inspectable_web_contents_view.h"
 
-@interface NSView (WebContentsView)
-- (void)setMouseDownCanMoveWindow:(BOOL)can_move;
-@end
-
-@interface ControlRegionView : NSView
-@end
-
-@implementation ControlRegionView
-
-- (BOOL)mouseDownCanMoveWindow {
-  return NO;
-}
-
-- (NSView*)hitTest:(NSPoint)aPoint {
-  return nil;
-}
-
-@end
-
 namespace electron {
 
 namespace api {
 
-namespace {
-
-// Return a vector of non-draggable regions that fill a window of size
-// |width| by |height|, but leave gaps where the window should be draggable.
-std::vector<gfx::Rect> CalculateNonDraggableRegions(
-    std::unique_ptr<SkRegion> draggable,
-    int width,
-    int height) {
-  std::vector<gfx::Rect> result;
-  SkRegion non_draggable;
-  non_draggable.op({0, 0, width, height}, SkRegion::kUnion_Op);
-  non_draggable.op(*draggable, SkRegion::kDifference_Op);
-  for (SkRegion::Iterator it(non_draggable); !it.done(); it.next()) {
-    result.push_back(gfx::SkIRectToRect(it.rect()));
-  }
-  return result;
-}
-
-}  // namespace
-
 void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
   // Make NativeWindow use a NSView as content view.
   static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
@@ -74,6 +36,10 @@ void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
   [contentView viewDidMoveToWindow];
 }
 
+void BrowserWindow::OnDevToolsResized() {
+  UpdateDraggableRegions(draggable_regions_);
+}
+
 void BrowserWindow::UpdateDraggableRegions(
     const std::vector<mojom::DraggableRegionPtr>& regions) {
   if (window_->has_frame())
@@ -102,13 +68,19 @@ void BrowserWindow::UpdateDraggableRegions(
     if ([subview isKindOfClass:[ControlRegionView class]])
       [subview removeFromSuperview];
 
-  // Draggable regions is implemented by having the whole web view draggable
-  // (mouseDownCanMoveWindow) and overlaying regions that are not draggable.
+  // Draggable regions are implemented by having the whole web view draggable
+  // and overlaying regions that are not draggable.
   if (&draggable_regions_ != &regions) {
     draggable_regions_.clear();
     for (const auto& r : regions)
       draggable_regions_.push_back(r.Clone());
   }
+
+  auto browser_views = window_->browser_views();
+  for (NativeBrowserView* view : browser_views) {
+    view->UpdateDraggableRegions(draggable_regions_);
+  }
+
   std::vector<gfx::Rect> drag_exclude_rects;
   if (regions.empty()) {
     drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
@@ -117,11 +89,6 @@ void BrowserWindow::UpdateDraggableRegions(
         DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
   }
 
-  auto browser_views = window_->browser_views();
-  for (NativeBrowserView* view : browser_views) {
-    view->UpdateDraggableRegions(drag_exclude_rects);
-  }
-
   // Create and add a ControlRegionView for each region that needs to be
   // excluded from the dragging.
   for (const auto& rect : drag_exclude_rects) {

shell/browser/api/electron_api_browser_window_views.cc

@@ -15,7 +15,7 @@ void BrowserWindow::UpdateDraggableRegions(
   if (window_->has_frame())
     return;
   static_cast<NativeWindowViews*>(window_.get())
-      ->UpdateDraggableRegions(DraggableRegionsToSkRegion(regions));
+      ->UpdateDraggableRegions(regions);
 }
 
 }  // namespace api

shell/browser/api/electron_api_debugger.cc

@@ -54,8 +54,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
                                        base::JSON_REPLACE_INVALID_CHARACTERS);
   if (!parsed_message || !parsed_message->is_dict())
     return;
-  base::DictionaryValue* dict =
-      static_cast<base::DictionaryValue*>(parsed_message.get());
+  auto* dict = static_cast<base::DictionaryValue*>(parsed_message.get());
   int id;
   if (!dict->GetInteger("id", &id)) {
     std::string method;

shell/browser/api/electron_api_download_item.cc

@@ -77,7 +77,7 @@ gin::WrapperInfo DownloadItem::kWrapperInfo = {gin::kEmbedderNativeGin};
 DownloadItem* DownloadItem::FromDownloadItem(
     download::DownloadItem* download_item) {
   // ^- say that 7 times fast in a row
-  UserDataLink* data = static_cast<UserDataLink*>(
+  auto* data = static_cast<UserDataLink*>(
       download_item->GetUserData(kElectronApiDownloadItemKey));
   return data ? data->download_item.get() : nullptr;
 }

shell/browser/api/electron_api_power_monitor_win.cc

@@ -59,7 +59,7 @@ LRESULT CALLBACK PowerMonitor::WndProcStatic(HWND hwnd,
                                              UINT message,
                                              WPARAM wparam,
                                              LPARAM lparam) {
-  PowerMonitor* msg_wnd =
+  auto* msg_wnd =
       reinterpret_cast<PowerMonitor*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);

shell/browser/api/electron_api_session.cc

@@ -934,7 +934,7 @@ bool Session::RemoveWordFromSpellCheckerDictionary(const std::string& word) {
 
 // static
 Session* Session::FromBrowserContext(content::BrowserContext* context) {
-  UserDataLink* data =
+  auto* data =
       static_cast<UserDataLink*>(context->GetUserData(kElectronApiSessionKey));
   return data ? data->session : nullptr;
 }

shell/browser/api/electron_api_system_preferences_win.cc

@@ -218,7 +218,7 @@ LRESULT CALLBACK SystemPreferences::WndProcStatic(HWND hwnd,
                                                   UINT message,
                                                   WPARAM wparam,
                                                   LPARAM lparam) {
-  SystemPreferences* msg_wnd = reinterpret_cast<SystemPreferences*>(
+  auto* msg_wnd = reinterpret_cast<SystemPreferences*>(
       GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);

shell/browser/api/electron_api_web_contents.cc

@@ -21,7 +21,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/hang_monitor/hang_crash_dump.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "content/browser/renderer_host/frame_tree_node.h"  // nogncheck
 #include "content/browser/renderer_host/render_frame_host_manager.h"  // nogncheck
@@ -141,6 +140,10 @@
 #include "printing/mojom/print.mojom.h"
 #endif
 
+#ifndef MAS_BUILD
+#include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
+#endif
+
 namespace gin {
 
 #if BUILDFLAG(ENABLE_PRINTING)
@@ -823,8 +826,7 @@ void WebContents::AddNewContents(
            initial_rect.x(), initial_rect.y(), initial_rect.width(),
            initial_rect.height(), tracker->url, tracker->frame_name,
            tracker->referrer, tracker->raw_features, tracker->body)) {
-    // TODO(zcbenz): Can we make this sync?
-    api_web_contents->DestroyWebContents(true /* async */);
+    api_web_contents->DestroyWebContents(false /* async */);
   }
 }
 
@@ -1471,6 +1473,11 @@ void WebContents::DevToolsClosed() {
   Emit("devtools-closed");
 }
 
+void WebContents::DevToolsResized() {
+  for (ExtendedWebContentsObserver& observer : observers_)
+    observer.OnDevToolsResized();
+}
+
 bool WebContents::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebContents, message)
@@ -1773,7 +1780,9 @@ void WebContents::ForcefullyCrashRenderer() {
     rph->ForceCrash();
 #else
     // Try to generate a crash report for the hung process.
+#ifndef MAS_BUILD
     CrashDumpHungChildProcess(rph->GetProcess().Handle());
+#endif
     rph->Shutdown(content::RESULT_CODE_HUNG);
 #endif
   }
@@ -2168,8 +2177,9 @@ void WebContents::Print(gin::Arguments* args) {
       int from, to;
       if (range.Get("from", &from) && range.Get("to", &to)) {
         base::Value range(base::Value::Type::DICTIONARY);
-        range.SetIntKey(printing::kSettingPageRangeFrom, from);
-        range.SetIntKey(printing::kSettingPageRangeTo, to);
+        // Chromium uses 1-based page ranges, so increment each by 1.
+        range.SetIntKey(printing::kSettingPageRangeFrom, from + 1);
+        range.SetIntKey(printing::kSettingPageRangeTo, to + 1);
         page_range_list.Append(std::move(range));
       } else {
         continue;
@@ -3074,7 +3084,7 @@ gin::Handle<WebContents> WebContents::CreateAndTake(
 WebContents* WebContents::From(content::WebContents* web_contents) {
   if (!web_contents)
     return nullptr;
-  UserDataLink* data = static_cast<UserDataLink*>(
+  auto* data = static_cast<UserDataLink*>(
       web_contents->GetUserData(kElectronApiWebContentsKey));
   return data ? data->web_contents.get() : nullptr;
 }

shell/browser/api/electron_api_web_contents.h

@@ -31,6 +31,7 @@
 #include "shell/browser/api/save_page_handler.h"
 #include "shell/browser/common_web_contents_delegate.h"
 #include "shell/browser/event_emitter_mixin.h"
+#include "shell/browser/extended_web_contents_observer.h"
 #include "shell/common/gin_helper/cleaned_up_at_exit.h"
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
@@ -120,22 +121,6 @@ class OffScreenRenderWidgetHostView;
 
 namespace api {
 
-// Certain events are only in WebContentsDelegate, provide our own Observer to
-// dispatch those events.
-class ExtendedWebContentsObserver : public base::CheckedObserver {
- public:
-  virtual void OnCloseContents() {}
-  virtual void OnDraggableRegionsUpdated(
-      const std::vector<mojom::DraggableRegionPtr>& regions) {}
-  virtual void OnSetContentBounds(const gfx::Rect& rect) {}
-  virtual void OnActivateContents() {}
-  virtual void OnPageTitleUpdated(const base::string16& title,
-                                  bool explicit_set) {}
-
- protected:
-  ~ExtendedWebContentsObserver() override {}
-};
-
 // Wrapper around the content::WebContents.
 class WebContents : public gin::Wrappable<WebContents>,
                     public gin_helper::EventEmitterMixin<WebContents>,
@@ -604,6 +589,7 @@ class WebContents : public gin::Wrappable<WebContents>,
   void DevToolsFocused() override;
   void DevToolsOpened() override;
   void DevToolsClosed() override;
+  void DevToolsResized() override;
 
  private:
   ElectronBrowserContext* GetBrowserContext() const;

shell/browser/api/process_metric.cc

@@ -103,7 +103,7 @@ ProcessIntegrityLevel ProcessMetric::GetIntegrityLevel() const {
   }
 
   auto token_label_bytes = std::make_unique<char[]>(token_info_length);
-  TOKEN_MANDATORY_LABEL* token_label =
+  auto* token_label =
       reinterpret_cast<TOKEN_MANDATORY_LABEL*>(token_label_bytes.get());
   if (!::GetTokenInformation(token, TokenIntegrityLevel, token_label,
                              token_info_length, &token_info_length)) {

shell/browser/browser_win.cc

@@ -196,19 +196,30 @@ std::vector<Browser::LaunchItem> GetLoginItemSettingsHelper(
     const Browser::LoginItemSettings& options) {
   std::vector<Browser::LaunchItem> launch_items;
 
-  while (it->Valid()) {
-    base::string16 exe = options.path;
-    if (FormatCommandLineString(&exe, options.args)) {
+  base::FilePath lookup_exe_path;
+  if (options.path.empty()) {
+    base::string16 process_exe_path;
+    GetProcessExecPath(&process_exe_path);
+    lookup_exe_path =
+        base::CommandLine::FromString(process_exe_path).GetProgram();
+  } else {
+    lookup_exe_path = base::CommandLine::FromString(options.path).GetProgram();
+  }
+
+  if (!lookup_exe_path.empty()) {
+    while (it->Valid()) {
+      base::CommandLine registry_launch_cmd =
+          base::CommandLine::FromString(it->Value());
+      base::FilePath registry_launch_path = registry_launch_cmd.GetProgram();
+      bool exe_match = base::FilePath::CompareEqualIgnoreCase(
+          lookup_exe_path.value(), registry_launch_path.value());
+
       // add launch item to vector if it has a matching path (case-insensitive)
-      if ((base::CompareCaseInsensitiveASCII(it->Value(), exe.c_str())) == 0) {
+      if (exe_match) {
         Browser::LaunchItem launch_item;
-        base::string16 launch_path = options.path;
-        if (launch_path.empty()) {
-          GetProcessExecPath(&launch_path);
-        }
         launch_item.name = it->Name();
-        launch_item.path = launch_path;
-        launch_item.args = options.args;
+        launch_item.path = registry_launch_path.value();
+        launch_item.args = registry_launch_cmd.GetArgs();
         launch_item.scope = scope;
         launch_item.enabled = true;
 
@@ -249,8 +260,8 @@ std::vector<Browser::LaunchItem> GetLoginItemSettingsHelper(
                   reinterpret_cast<char*>(binary_accepted_alt));
               std::string reg_startup_binary(
                   reinterpret_cast<char*>(startup_binary));
-              launch_item.enabled = (reg_binary == reg_startup_binary) ||
-                                    (reg_binary == reg_binary_alt);
+              launch_item.enabled = (reg_startup_binary == reg_binary) ||
+                                    (reg_startup_binary == reg_binary_alt);
             }
           }
         }
@@ -259,8 +270,8 @@ std::vector<Browser::LaunchItem> GetLoginItemSettingsHelper(
             *executable_will_launch_at_login || launch_item.enabled;
         launch_items.push_back(launch_item);
       }
+      it->operator++();
     }
-    it->operator++();
   }
   return launch_items;
 }

shell/browser/electron_browser_client.cc

@@ -929,7 +929,7 @@ ElectronBrowserClient::CreateWindowForPictureInPicture(
 #if defined(OS_WIN)
   base::string16 app_user_model_id = Browser::Get()->GetAppUserModelID();
   if (!app_user_model_id.empty()) {
-    OverlayWindowViews* overlay_window_view =
+    auto* overlay_window_view =
         static_cast<OverlayWindowViews*>(overlay_window.get());
     ui::win::SetAppIdForWindow(app_user_model_id,
                                overlay_window_view->GetNativeWindow()

shell/browser/electron_browser_main_parts.cc

@@ -11,6 +11,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
+#include "base/optional.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -370,23 +371,34 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   // which keys off of getenv("LC_ALL").
   // We must set this env first to make ui::ResourceBundle accept the custom
   // locale.
-  g_setenv("LC_ALL", locale.c_str(), TRUE);
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
+  base::Optional<std::string> lc_all;
+  if (!locale.empty()) {
+    std::string str;
+    if (env->GetVar("LC_ALL", &str))
+      lc_all.emplace(std::move(str));
+    env->SetVar("LC_ALL", locale.c_str());
+  }
 #endif
 
   // Load resources bundle according to locale.
   std::string loaded_locale = LoadResourceBundle(locale);
 
-#if defined(OS_LINUX)
-  // Reset to the loaded locale if the custom locale is invalid.
-  if (loaded_locale != locale)
-    g_setenv("LC_ALL", loaded_locale.c_str(), TRUE);
-#endif
-
   // Initialize the app locale.
   std::string app_locale = l10n_util::GetApplicationLocale(loaded_locale);
   ElectronBrowserClient::SetApplicationLocale(app_locale);
   fake_browser_process_->SetApplicationLocale(app_locale);
 
+#if defined(OS_LINUX)
+  // Reset to the original LC_ALL since we should not be changing it.
+  if (!locale.empty()) {
+    if (lc_all)
+      env->SetVar("LC_ALL", *lc_all);
+    else
+      env->UnSetVar("LC_ALL");
+  }
+#endif
+
   // Force MediaCaptureDevicesDispatcher to be created on UI thread.
   MediaCaptureDevicesDispatcher::GetInstance();
 

shell/browser/electron_download_manager_delegate.cc

@@ -153,9 +153,8 @@ void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone(
   if (!canceled) {
     if (result.Get("filePath", &path)) {
       // Remember the last selected download directory.
-      ElectronBrowserContext* browser_context =
-          static_cast<ElectronBrowserContext*>(
-              download_manager_->GetBrowserContext());
+      auto* browser_context = static_cast<ElectronBrowserContext*>(
+          download_manager_->GetBrowserContext());
       browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
                                             path.DirName());
 
@@ -211,9 +210,8 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
     return true;
   }
 
-  ElectronBrowserContext* browser_context =
-      static_cast<ElectronBrowserContext*>(
-          download_manager_->GetBrowserContext());
+  auto* browser_context = static_cast<ElectronBrowserContext*>(
+      download_manager_->GetBrowserContext());
   base::FilePath default_download_path =
       browser_context->prefs()->GetFilePath(prefs::kDownloadDefaultDirectory);
 

shell/browser/extended_web_contents_observer.h

@@ -0,0 +1,36 @@
+// Copyright (c) 2020 Microsoft, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef SHELL_BROWSER_EXTENDED_WEB_CONTENTS_OBSERVER_H_
+#define SHELL_BROWSER_EXTENDED_WEB_CONTENTS_OBSERVER_H_
+
+#include <vector>
+
+#include "base/observer_list.h"
+#include "base/strings/string16.h"
+#include "electron/shell/common/api/api.mojom.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace electron {
+
+// Certain events are only in WebContentsDelegate, so we provide our own
+// Observer to dispatch those events.
+class ExtendedWebContentsObserver : public base::CheckedObserver {
+ public:
+  virtual void OnCloseContents() {}
+  virtual void OnDraggableRegionsUpdated(
+      const std::vector<mojom::DraggableRegionPtr>& regions) {}
+  virtual void OnSetContentBounds(const gfx::Rect& rect) {}
+  virtual void OnActivateContents() {}
+  virtual void OnPageTitleUpdated(const base::string16& title,
+                                  bool explicit_set) {}
+  virtual void OnDevToolsResized() {}
+
+ protected:
+  ~ExtendedWebContentsObserver() override {}
+};
+
+}  // namespace electron
+
+#endif  // SHELL_BROWSER_EXTENDED_WEB_CONTENTS_OBSERVER_H_

shell/browser/mac/electron_application.mm

@@ -177,38 +177,24 @@ inline void dispatch_sync_main(dispatch_block_t block) {
   electron::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
 }
 
-- (bool)voiceOverEnabled {
-  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-  [defaults addSuiteNamed:@"com.apple.universalaccess"];
-  [defaults synchronize];
-
-  return [defaults boolForKey:@"voiceOverOnOffKey"];
-}
-
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
-  // Undocumented attribute that VoiceOver happens to set while running.
-  // Chromium uses this too, even though it's not exactly right.
-  if ([attribute isEqualToString:@"AXEnhancedUserInterface"]) {
-    bool enableAccessibility = ([self voiceOverEnabled] && [value boolValue]);
-    [self updateAccessibilityEnabled:enableAccessibility];
-  } else if ([attribute isEqualToString:@"AXManualAccessibility"]) {
-    [self updateAccessibilityEnabled:[value boolValue]];
+  // Undocumented attribute that screen reader related functionality
+  // sets when running.
+  if ([attribute isEqualToString:@"AXEnhancedUserInterface"] ||
+      [attribute isEqualToString:@"AXManualAccessibility"]) {
+    auto* ax_state = content::BrowserAccessibilityState::GetInstance();
+    if ([value boolValue]) {
+      ax_state->OnScreenReaderDetected();
+    } else {
+      ax_state->DisableAccessibility();
+    }
+
+    electron::Browser::Get()->OnAccessibilitySupportChanged();
   }
+
   return [super accessibilitySetValue:value forAttribute:attribute];
 }
 
-- (void)updateAccessibilityEnabled:(BOOL)enabled {
-  auto* ax_state = content::BrowserAccessibilityState::GetInstance();
-
-  if (enabled) {
-    ax_state->OnScreenReaderDetected();
-  } else {
-    ax_state->DisableAccessibility();
-  }
-
-  electron::Browser::Get()->OnAccessibilitySupportChanged();
-}
-
 - (void)orderFrontStandardAboutPanel:(id)sender {
   electron::Browser::Get()->ShowAboutPanel();
 }

shell/browser/native_browser_view.h

@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "shell/common/api/api.mojom.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace gfx {
@@ -49,7 +50,7 @@ class NativeBrowserView : public content::WebContentsObserver {
 
   // Called when the window needs to update its draggable region.
   virtual void UpdateDraggableRegions(
-      const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
+      const std::vector<mojom::DraggableRegionPtr>& regions) {}
 
  protected:
   explicit NativeBrowserView(InspectableWebContents* inspectable_web_contents);

shell/browser/native_browser_view_mac.h

@@ -25,9 +25,11 @@ class NativeBrowserViewMac : public NativeBrowserView {
   void SetBackgroundColor(SkColor color) override;
 
   void UpdateDraggableRegions(
-      const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
+      const std::vector<mojom::DraggableRegionPtr>& regions) override;
 
  private:
+  std::vector<mojom::DraggableRegionPtr> draggable_regions_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewMac);
 };
 

shell/browser/native_browser_view_mac.mm

@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "shell/browser/ui/drag_util.h"
 #include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_view.h"
 #include "skia/ext/skia_utils_mac.h"
@@ -33,10 +34,16 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
   return NO;
 }
 
-- (NSView*)hitTest:(NSPoint)aPoint {
-  // Pass-through events that don't hit one of the exclusion zones
-  for (NSView* exlusion_zones in [self subviews]) {
-    if ([exlusion_zones hitTest:aPoint])
+- (BOOL)shouldIgnoreMouseEvent {
+  NSEventType type = [[NSApp currentEvent] type];
+  return type != NSEventTypeLeftMouseDragged &&
+         type != NSEventTypeLeftMouseDown;
+}
+
+- (NSView*)hitTest:(NSPoint)point {
+  // Pass-through events that hit one of the exclusion zones
+  for (NSView* exclusion_zones in [self subviews]) {
+    if ([exclusion_zones hitTest:point])
       return nil;
   }
 
@@ -44,6 +51,8 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
 }
 
 - (void)mouseDown:(NSEvent*)event {
+  [super mouseDown:event];
+
   if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
     // According to Google, using performWindowDragWithEvent:
     // does not generate a NSWindowWillMoveNotification. Hence post one.
@@ -64,7 +73,7 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
   self.initialLocation = [event locationInWindow];
 }
 
-- (void)mouseDragged:(NSEvent*)theEvent {
+- (void)mouseDragged:(NSEvent*)event {
   if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
     return;
   }
@@ -124,15 +133,13 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
   [self.window setFrameOrigin:newOrigin];
 }
 
-// Debugging tips:
-// Uncomment the following four lines to color DragRegionView bright red
-// #ifdef DEBUG_DRAG_REGIONS
-// - (void)drawRect:(NSRect)aRect
-// {
-//     [[NSColor redColor] set];
-//     NSRectFill([self bounds]);
-// }
-// #endif
+// For debugging purposes only.
+- (void)drawRect:(NSRect)aRect {
+  if (getenv("ELECTRON_DEBUG_DRAG_REGIONS")) {
+    [[[NSColor greenColor] colorWithAlphaComponent:0.5] set];
+    NSRectFill([self bounds]);
+  }
+}
 
 @end
 
@@ -145,15 +152,13 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
   return NO;
 }
 
-// Debugging tips:
-// Uncomment the following four lines to color ExcludeDragRegionView bright red
-// #ifdef DEBUG_DRAG_REGIONS
-// - (void)drawRect:(NSRect)aRect
-// {
-//     [[NSColor greenColor] set];
-//     NSRectFill([self bounds]);
-// }
-// #endif
+// For debugging purposes only.
+- (void)drawRect:(NSRect)aRect {
+  if (getenv("ELECTRON_DEBUG_DRAG_REGIONS")) {
+    [[[NSColor redColor] colorWithAlphaComponent:0.5] set];
+    NSRectFill([self bounds]);
+  }
+}
 
 @end
 
@@ -205,6 +210,9 @@ void NativeBrowserViewMac::SetBounds(const gfx::Rect& bounds) {
   view.frame =
       NSMakeRect(bounds.x(), superview_height - bounds.y() - bounds.height(),
                  bounds.width(), bounds.height());
+
+  // Ensure draggable regions are properly updated to reflect new bounds.
+  UpdateDraggableRegions(draggable_regions_);
 }
 
 gfx::Rect NativeBrowserViewMac::GetBounds() {
@@ -230,16 +238,37 @@ void NativeBrowserViewMac::SetBackgroundColor(SkColor color) {
 }
 
 void NativeBrowserViewMac::UpdateDraggableRegions(
-    const std::vector<gfx::Rect>& drag_exclude_rects) {
+    const std::vector<mojom::DraggableRegionPtr>& regions) {
+  if (!inspectable_web_contents_)
+    return;
+  auto* web_contents = inspectable_web_contents_->GetWebContents();
   auto* iwc_view = GetInspectableWebContentsView();
-  auto* web_contents = GetWebContents();
-  if (!(iwc_view && web_contents))
+  if (!iwc_view || !web_contents)
     return;
   NSView* web_view = GetWebContents()->GetNativeView().GetNativeNSView();
   NSView* inspectable_view = iwc_view->GetNativeView().GetNativeNSView();
   NSView* window_content_view = inspectable_view.superview;
   const auto window_content_view_height = NSHeight(window_content_view.bounds);
 
+  NSInteger webViewWidth = NSWidth([web_view bounds]);
+  NSInteger webViewHeight = NSHeight([web_view bounds]);
+
+  std::vector<gfx::Rect> drag_exclude_rects;
+  if (regions.empty()) {
+    drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
+  } else {
+    drag_exclude_rects = CalculateNonDraggableRegions(
+        DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
+  }
+
+  // Draggable regions are implemented by having the whole web view draggable
+  // and overlaying regions that are not draggable.
+  if (&draggable_regions_ != &regions) {
+    draggable_regions_.clear();
+    for (const auto& r : regions)
+      draggable_regions_.push_back(r.Clone());
+  }
+
   // Remove all DragRegionViews that were added last time. Note that we need
   // to copy the `subviews` array to avoid mutation during iteration.
   base::scoped_nsobject<NSArray> subviews([[web_view subviews] copy]);

shell/browser/native_window.cc

@@ -493,6 +493,11 @@ void NativeWindow::NotifyWindowResize() {
     observer.OnWindowResize();
 }
 
+void NativeWindow::NotifyWindowResized() {
+  for (NativeWindowObserver& observer : observers_)
+    observer.OnWindowResized();
+}
+
 void NativeWindow::NotifyWindowMove() {
   for (NativeWindowObserver& observer : observers_)
     observer.OnWindowMove();

shell/browser/native_window.h

@@ -270,6 +270,7 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowWillResize(const gfx::Rect& new_bounds,
                               bool* prevent_default);
   void NotifyWindowResize();
+  void NotifyWindowResized();
   void NotifyWindowWillMove(const gfx::Rect& new_bounds, bool* prevent_default);
   void NotifyWindowMoved();
   void NotifyWindowScrollTouchBegin();

shell/browser/native_window_observer.h

@@ -74,6 +74,7 @@ class NativeWindowObserver : public base::CheckedObserver {
   virtual void OnWindowWillResize(const gfx::Rect& new_bounds,
                                   bool* prevent_default) {}
   virtual void OnWindowResize() {}
+  virtual void OnWindowResized() {}
   virtual void OnWindowWillMove(const gfx::Rect& new_bounds,
                                 bool* prevent_default) {}
   virtual void OnWindowMove() {}

shell/browser/native_window_views.cc

@@ -20,6 +20,7 @@
 #include "content/public/browser/desktop_media_id.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/native_browser_view_views.h"
+#include "shell/browser/ui/drag_util.h"
 #include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_view.h"
 #include "shell/browser/ui/views/root_view.h"
@@ -1280,8 +1281,8 @@ gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
 }
 
 void NativeWindowViews::UpdateDraggableRegions(
-    std::unique_ptr<SkRegion> region) {
-  draggable_region_ = std::move(region);
+    const std::vector<mojom::DraggableRegionPtr>& regions) {
+  draggable_region_ = DraggableRegionsToSkRegion(regions);
 }
 
 #if defined(OS_WIN)
@@ -1335,8 +1336,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
     int width_delta = new_bounds.width() - widget_size_.width();
     int height_delta = new_bounds.height() - widget_size_.height();
     for (NativeBrowserView* item : browser_views()) {
-      NativeBrowserViewViews* native_view =
-          static_cast<NativeBrowserViewViews*>(item);
+      auto* native_view = static_cast<NativeBrowserViewViews*>(item);
       native_view->SetAutoResizeProportions(widget_size_);
       native_view->AutoResize(new_bounds, width_delta, height_delta);
     }
@@ -1404,7 +1404,7 @@ bool NativeWindowViews::ShouldDescendIntoChildForEventHandling(
 
   // And the events on border for dragging resizable frameless window.
   if (!has_frame() && CanResize()) {
-    FramelessView* frame =
+    auto* frame =
         static_cast<FramelessView*>(widget()->non_client_view()->frame_view());
     return frame->ResizingBorderHitTest(location) == HTNOWHERE;
   }

shell/browser/native_window_views.h

@@ -11,7 +11,9 @@
 #include <set>
 #include <string>
 #include <tuple>
+#include <vector>
 
+#include "shell/common/api/api.mojom.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_WIN)
@@ -137,7 +139,8 @@ class NativeWindowViews : public NativeWindow,
   gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
   gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
 
-  void UpdateDraggableRegions(std::unique_ptr<SkRegion> region);
+  void UpdateDraggableRegions(
+      const std::vector<mojom::DraggableRegionPtr>& regions);
 
   void IncrementChildModals();
   void DecrementChildModals();
@@ -279,6 +282,12 @@ class NativeWindowViews : public NativeWindow,
 
   // Whether we want to set window placement without side effect.
   bool is_setting_window_placement_ = false;
+
+  // Whether the window is currently being resized.
+  bool is_resizing_ = false;
+
+  // Whether the window is currently being moved.
+  bool is_moving_ = false;
 #endif
 
   // Handles unhandled keyboard messages coming back from the renderer process.