Bump v9.0.0-nightly.20200109

* docs: update react devtool version in document

* bump react devtool version ref to 4.3.0

.circleci/config.yml

@@ -81,6 +81,7 @@ env-release-build: &env-release-build
   GN_CONFIG: //electron/build/args/release.gn
   STRIP_BINARIES: true
   GENERATE_SYMBOLS: true
+  CHECK_DIST_MANIFEST: '1'
 
 env-headless-testing: &env-headless-testing
   DISPLAY: ':99.0'
@@ -444,6 +445,9 @@ step-electron-publish: &step-electron-publish
   run:
     name: Publish Electron Dist
     command: |
+      if [ "`uname`" == "Darwin" ]; then
+        rm -rf src/out/Default/obj
+      fi
       cd src/electron
       if [ "$UPLOAD_TO_S3" == "1" ]; then
         echo 'Uploading Electron release distribution to S3'

.github/ISSUE_TEMPLATE/security_report.md

@@ -1,10 +0,0 @@
----
-name: Security report
-about: Do not create an issue for security reports, send an email to security@electronjs.org
-
----
-
-### Notice 
-
-**DO NOT** create an issue for security reports.
-Send an email to: **security@electronjs.org**.

BUILD.gn

@@ -354,7 +354,7 @@ source_set("electron_lib") {
     ":resources",
     "buildflags",
     "chromium_src:chrome",
-    "native_mate",
+    "chromium_src:chrome_spellchecker",
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
@@ -383,12 +383,10 @@ source_set("electron_lib") {
     "//media/mojo/mojom",
     "//net:extras",
     "//net:net_resources",
-    "//net:net_with_v8",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
     "//printing/buildflags",
-    "//services/audio/public/mojom:constants",
     "//services/device/public/cpp/geolocation",
     "//services/device/public/mojom",
     "//services/proxy_resolver:lib",
@@ -400,7 +398,7 @@ source_set("electron_lib") {
     "//third_party/electron_node:node_lib",
     "//third_party/leveldatabase",
     "//third_party/libyuv",
-    "//third_party/webrtc_overrides:init_webrtc",
+    "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/widevine/cdm:headers",
     "//ui/base/idle",
     "//ui/events:dom_keycode_converter",
@@ -482,10 +480,6 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_builtin_spellchecker) {
-    deps += [ "chromium_src:chrome_spellchecker" ]
-  }
-
   if (is_mac) {
     deps += [
       "//components/remote_cocoa/app_shim",

DEPS

@@ -11,9 +11,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    'dc9525d251bf30828899e4cd7161f6dc6507023f',
+    'd0c764fc71894cc24d3bb17a7406ba6c6cc6dc29',
   'node_version':
-    'v12.13.0',
+    'v12.14.0',
   'nan_version':
     '2ee313aaca52e2b478965ac50eb5082520380d1b',
 

ELECTRON_VERSION

@@ -1 +1 @@
-9.0.0-nightly.20191128
+9.0.0-nightly.20200109

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 GitHub Inc.
+Copyright (c) 2013-2020 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

appveyor.yml

@@ -78,7 +78,7 @@ build_script:
       "https://github.com/electron/electron"
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        gclient sync --with_branch_heads --with_tags --reset
+        $env:RUN_GCLIENT_SYNC="true"
       } else {
         cd src\electron
         node script\generate-deps-hash.js
@@ -92,16 +92,22 @@ build_script:
           python src/electron/script/update-external-binaries.py
         } else {    
           # file does not exist, gclient sync, then zip
-          gclient sync --with_branch_heads --with_tags --reset
+          $env:RUN_GCLIENT_SYNC="true"
           if ($env:TARGET_ARCH -ne 'ia32') {
-            # archive current source for future use 
-            # only run on x64/woa to avoid contention saving
-            if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
-              Write-warning "Could not save source to shared drive; continuing anyway"
-            }
+            # only save on x64/woa to avoid contention saving
+            $env:SAVE_GCLIENT_SRC="true"
           }
         }
       }
+  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
+  - ps: >-
+      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
+        # archive current source for future use 
+        # only run on x64/woa to avoid contention saving
+        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
+          Write-warning "Could not save source to shared drive; continuing anyway"
+        }
+      }
   - cd src
   - ps: $env:BUILD_CONFIG_PATH="//electron/build/args/%GN_CONFIG%.gn"
   - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\""
@@ -140,12 +146,12 @@ build_script:
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         python electron\script\zip-symbols.py
-        appveyor PushArtifact out/Default/symbols.zip
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
         7z a pdb.zip out\Default\*.pdb
-        appveyor PushArtifact pdb.zip
+        appveyor-retry appveyor PushArtifact pdb.zip
       }
   - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:

build/args/all.gn

@@ -17,6 +17,7 @@ ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
+dawn_enable_vulkan_validation_layers = false
 
 is_cfi = false
 

build/args/goma.gn

@@ -0,0 +1,2 @@
+goma_dir = rebase_path("//electron/external_binaries/goma")
+use_goma = true

build/args/testing.gn

@@ -6,8 +6,6 @@ is_official_build = false
 dcheck_always_on = true
 symbol_level = 1
 
-strip_absolute_paths_from_debug_symbols = false
-
 # This may be guarded behind is_chrome_branded alongside
 # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
 # explicitly override here to build OpenH264 encoder/FFmpeg decoder.

build/zip.py

@@ -16,6 +16,10 @@ PATHS_TO_SKIP = [
   './libVkICD_mock_', #Skipping because these are outputs that we don't need
   './VkICD_mock_', #Skipping because these are outputs that we don't need
 
+  # Skipping because its an output of create_bundle from //build/config/mac/rules.gni
+  # that we don't need
+  'Electron.dSYM',
+
   # //chrome/browser:resources depends on this via
   # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
   # ship it.
@@ -52,14 +56,13 @@ def main(argv):
   with open(runtime_deps) as f:
     for dep in f.readlines():
       dep = dep.strip()
-      dist_files.add(dep)
+      if not skip_path(dep, dist_zip, target_cpu):
+        dist_files.add(dep)
   if sys.platform == 'darwin' and not should_flatten:
     execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
   else:
     with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
       for dep in dist_files:
-        if skip_path(dep, dist_zip, target_cpu):
-          continue
         if os.path.isdir(dep):
           for root, dirs, files in os.walk(dep):
             for file in files:

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_MEDIA_KEY_OVERRIDES=$enable_media_key_overrides",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -22,6 +22,8 @@ declare_args() {
 
   enable_picture_in_picture = true
 
+  enable_media_key_overrides = true
+
   # Provide a fake location provider for mocking
   # the geolocation responses. Disable it if you
   # need to test with chromium's location provider.

chromium_src/BUILD.gn

@@ -308,45 +308,51 @@ source_set("plugins") {
 # You may have to add new files here during the upgrade if //chrome/browser/spellchecker
 # gets more files
 source_set("chrome_spellchecker") {
-  sources = [
-    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
-    "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
-    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
-    "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
-    "//chrome/browser/spellchecker/spellcheck_factory.cc",
-    "//chrome/browser/spellchecker/spellcheck_factory.h",
-    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
-    "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
-    "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
-    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-    "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-    "//chrome/browser/spellchecker/spellcheck_service.cc",
-    "//chrome/browser/spellchecker/spellcheck_service.h",
-    "//chrome/common/pref_names.h",
-  ]
+  sources = []
+  deps = []
+  libs = []
 
-  if (has_spellcheck_panel) {
+  if (enable_builtin_spellchecker) {
     sources += [
-      "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
-      "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
+      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
+      "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
+      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
+      "//chrome/browser/spellchecker/spellcheck_custom_dictionary.h",
+      "//chrome/browser/spellchecker/spellcheck_factory.cc",
+      "//chrome/browser/spellchecker/spellcheck_factory.h",
+      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
+      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_service.cc",
+      "//chrome/browser/spellchecker/spellcheck_service.h",
+      "//chrome/common/pref_names.h",
+    ]
+
+    if (has_spellcheck_panel) {
+      sources += [
+        "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
+        "//chrome/browser/spellchecker/spell_check_panel_host_impl.h",
+      ]
+    }
+
+    if (use_browser_spellchecker) {
+      sources += [
+        "//chrome/browser/spellchecker/spelling_request.cc",
+        "//chrome/browser/spellchecker/spelling_request.h",
+      ]
+    }
+
+    deps += [
+      "//base:base_static",
+      "//components/language/core/browser",
+      "//components/spellcheck:buildflags",
+      "//components/sync",
     ]
   }
 
-  if (use_browser_spellchecker) {
-    sources += [
-      "//chrome/browser/spellchecker/spelling_request.cc",
-      "//chrome/browser/spellchecker/spelling_request.h",
-    ]
-  }
-
-  deps = [
-    "//base:base_static",
-    "//components/language/core/browser",
-    "//components/spellcheck:buildflags",
-    "//components/sync",
-  ]
-
   public_deps = [
     "//components/spellcheck/browser",
     "//components/spellcheck/common",

docs/api/breaking-changes.md

@@ -20,6 +20,30 @@ const { remote } = require('electron')
 remote.webContents.fromId(webview.getWebContentsId())
 ```
 
+### `webFrame.setLayoutZoomLevelLimits()`
+
+Chromium has removed support for changing the layout zoom level limits, and it
+is beyond Electron's capacity to maintain it. The function was deprecated in
+Electron 8.x, and has been removed in Electron 9.x. The layout zoom level limits
+are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
+[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
+
+### Sending non-JS objects over IPC now throws an exception
+
+In Electron 8.0, IPC was changed to use the Structured Clone Algorithm,
+bringing significant performance improvements. To help ease the transition, the
+old IPC serialization algorithm was kept and used for some objects that aren't
+serializable with Structured Clone. In particular, DOM objects (e.g. `Element`,
+`Location` and `DOMMatrix`), Node.js objects backed by C++ classes (e.g.
+`process.env`, some members of `Stream`), and Electron objects backed by C++
+classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not
+serializable with Structured Clone. Whenever the old algorithm was invoked, a
+deprecation warning was printed.
+
+In Electron 9.0, the old serialization algorithm has been removed, and sending
+such non-serializable objects will now throw an "object could not be cloned"
+error.
+
 ## Planned Breaking API Changes (8.0)
 
 ### Values sent over IPC are now serialized with Structured Clone Algorithm
@@ -114,6 +138,14 @@ const { ipcRenderer } = require('electron')
 ipcRenderer.invoke('openDevTools', webview.getWebContentsId())
 ```
 
+### `webFrame.setLayoutZoomLevelLimits()`
+
+Chromium has removed support for changing the layout zoom level limits, and it
+is beyond Electron's capacity to maintain it. The function will emit a warning
+in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
+limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
+[here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
+
 ## Planned Breaking API Changes (7.0)
 
 ### Node Headers URL

docs/api/browser-window.md

@@ -1019,6 +1019,11 @@ console.log(win.getBounds())
 
 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.
 
+#### `win.getBackgroundColor()`
+
+Returns `String` - Gets the background color of the window. See [Setting
+`backgroundColor`](#setting-backgroundcolor).
+
 #### `win.setContentBounds(bounds[, animate])`
 
 * `bounds` [Rectangle](structures/rectangle.md)

docs/api/content-tracing.md

@@ -38,6 +38,9 @@ Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
 categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).
 
+> **NOTE:** Electron adds a non-default tracing category called `"electron"`.
+> This category can be used to capture Electron-specific tracing events.
+
 ### `contentTracing.startRecording(options)`
 
 * `options` ([TraceConfig](structures/trace-config.md) | [TraceCategoriesAndOptions](structures/trace-categories-and-options.md))

docs/api/in-app-purchase.md

@@ -40,11 +40,17 @@ Retrieves the product descriptions.
 
 ### `inAppPurchase.canMakePayments()`
 
-Returns `Boolean`, whether a user can make a payment.
+Returns `Boolean` - whether a user can make a payment.
+
+### `inAppPurchase.restoreCompletedTransactions()`
+
+Restores finished transactions. This method can be called either to install purchases on additional devices, or to restore purchases for an application that the user deleted and reinstalled.
+
+[The payment queue](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc) delivers a new transaction for each previously completed transaction that can be restored. Each transaction includes a copy of the original transaction.
 
 ### `inAppPurchase.getReceiptURL()`
 
-Returns `String`, the path to the receipt.
+Returns `String` - the path to the receipt.
 
 ### `inAppPurchase.finishAllTransactions()`
 

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md)
     * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.

docs/api/session.md

@@ -126,9 +126,10 @@ Clears the session’s HTTP cache.
     `scheme://host:port`.
   * `storages` String[] (optional) - The types of storages to clear, can contain:
     `appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
-    `shadercache`, `websql`, `serviceworkers`, `cachestorage`.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
+    specified, clear all storage types.
   * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`.
+    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
 

docs/api/shell.md

@@ -28,10 +28,7 @@ Show the given file in a file manager. If possible, select the file.
 
 * `path` String
 
-Returns `Promise<Object>` - Resolve with an object containing the following:
-
-* `success` Boolean - whether or not the path was successfully opened in the desktop's default manner.
-* `errorMessage` String (optional) - The error message corresponding to the failure if a failure occurred, otherwise empty string.
+Returns `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".
 
 Open the given file in the desktop's default manner.
 

docs/api/web-contents.md

@@ -1113,15 +1113,6 @@ Sets the maximum and minimum pinch-to-zoom level.
 > contents.setVisualZoomLevelLimits(1, 3)
 > ```
 
-#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Returns `Promise<void>`
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 #### `contents.undo()`
 
 Executes the editing command `undo` in web page.
@@ -1238,7 +1229,7 @@ Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
 
 Get the system printer list.
 
-Returns [`PrinterInfo[]`](structures/printer-info.md).
+Returns [`PrinterInfo[]`](structures/printer-info.md)
 
 #### `contents.print([options], [callback])`
 
@@ -1327,12 +1318,13 @@ win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
   // Use default printing options
-  win.webContents.printToPDF({}, (error, data) => {
-    if (error) throw error
+  win.webContents.printToPDF({}).then(data => {
     fs.writeFile('/tmp/print.pdf', data, (error) => {
       if (error) throw error
       console.log('Write PDF successfully.')
     })
+  }).catch(error => {
+    console.log(error)
   })
 })
 ```

docs/api/web-frame.md

@@ -56,13 +56,6 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```
 
-### `webFrame.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 ### `webFrame.setSpellCheckProvider(language, provider)`
 
 * `language` String

docs/api/webview-tag.md

@@ -635,15 +635,6 @@ Returns `Promise<void>`
 
 Sets the maximum and minimum pinch-to-zoom level.
 
-### `<webview>.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
-
-* `minimumLevel` Number
-* `maximumLevel` Number
-
-Returns `Promise<void>`
-
-Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-
 ### `<webview>.showDefinitionForSelection()` _macOS_
 
 Shows pop-up dictionary that searches the selected word on the page.

docs/development/build-instructions-windows.md

@@ -11,9 +11,8 @@ Follow the guidelines below for building Electron on Windows.
   components are required.
   * If your Visual Studio is installed in a directory other than the default, you'll need to
   set a few environment variables to point the toolchains to your installation path.
-    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`
-       (replace `2019` and `Community` with your installed versions)
-    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`
+    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
+    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
 * [Python 2.7.10 or higher](http://www.python.org/download/releases/2.7/)
   * Contrary to the `depot_tools` setup instructions linked below, you will need
   to use your locally installed Python with at least version 2.7.10 (with

docs/development/goma.md

@@ -0,0 +1,61 @@
+# Goma
+
+> Goma is a distributed compiler service for open-source projects such as
+> Chromium and Android.
+
+Electron has a deployment of a custom Goma Backend that we make available to
+all Electron Maintainers.  See the [Access](#access) section below for details
+on authentication.
+
+## Enabling Goma
+
+Currently Electron Goma supports both Windows and Linux, we may add macOS
+support at some point in the future.  If you are on a supported platform
+you can enable goma by importing the `goma.gn` config file when using `gn`.
+
+```bash
+gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") import(\"//electron/build/args/goma.gn\")"
+```
+
+You must ensure that you do not have `cc_wrapper` configured, this means you
+can't use `sccache` or similar technology.
+
+Before you can use goma to build Electron you need to authenticate against
+the Goma service.  You only need to do this once per-machine.
+
+```bash
+cd electron/external_binaries/goma
+goma_auth.py login
+```
+
+Once authenticated you need to make sure the goma daemon is running on your
+machine.
+
+```bash
+cd electron/external_binaries/goma
+goma_ctl.py ensure_start
+```
+
+## Building with Goma
+
+When you are using Goma you can run `ninja` with a substantially higher `j`
+value than would normally be supported by your machine.  Please do not set
+a value higher than **300**, we monitor the goma system and users found to
+be abusing it with unreasonable concurrency will be de-activated.
+
+```bash
+ninja -C out/Testing electron -j 200
+```
+
+## Monitoring Goma
+
+If you access [http://localhost:8088](http://localhost:8088) on your local
+machine you can monitor compile jobs as they flow through the goma system.
+
+## Access
+
+For security and cost reasons access to Electron Goma is currently restricted
+to Electron Maintainers.  If you want access please head to `#access-requests` in
+Slack and ping `@goma-squad` to ask for access.  Please be aware that being a
+maintainer does not *automatically* grant access and access is determined on a
+case by case basis.

docs/development/source-code-directory-structure.md

@@ -42,8 +42,6 @@ Electron
 |   |   └── api/ - Javascript API implementation.
 |   └── renderer/ - Javascript renderer process initialization code.
 |       └── api/ - Javascript API implementation.
-├── native_mate/ - A fork of Chromium's gin library that makes it easier to marshal
-|                  types between C++ and JavaScript.
 ├── spec/ - Automatic tests.
 └── BUILD.gn - Building rules of Electron.
 ```

docs/fiddles/native-ui/external-links-file-manager/index.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Open external links and the file manager</title>
+  </head>
+  <body>
+    <div>
+      <h1>  
+        Open external links and the file manager
+      </h1>
+      <h3>
+        The <code>shell</code> module in Electron allows you to access certain
+        native elements like the file manager and default web browser.
+      </h3>
+
+      <p>This module works in both the main and renderer process.</p>
+      <p>
+        Open the
+        <a href="http://electron.atom.io/docs/api/shell">
+          full API documentation (opens in new window)
+        </a>
+        in your browser.
+      </p>
+    </div>
+
+    <div>
+      <div>
+        <h2>Open Path in File Manager</h2>
+        <div>
+          <div>
+            <button id="open-file-manager">
+              View Demo
+            </button>
+          </div>
+          <p>
+            This demonstrates using the <code>shell</code> module to open the
+            system file manager at a particular location.
+          </p>
+          <p>
+            Clicking the demo button will open your file manager at the root.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div>
+      <div>
+        <h2>Open External Links</h2>
+        <div>
+          <div>
+            <button id="open-ex-links">View Demo</button>
+          </div>
+          <p>
+            If you do not want your app to open website links
+            <em>within</em> the app, you can use the <code>shell</code> module
+            to open them externally. When clicked, the links will open outside
+            of your app and in the user's default web browser.
+          </p>
+          <p>
+            When the demo button is clicked, the electron website will open in
+            your browser.
+          </p>
+          <p></p>
+
+          <div>
+            <h2>ProTip</h2>
+            <strong>Open all outbound links externally.</strong>
+            <p>
+              You may want to open all <code>http</code> and
+              <code>https</code> links outside of your app. To do this, query
+              the document and loop through each link and add a listener. This
+              app uses the code below which is located in
+              <code>assets/ex-links.js</code>.
+            </p>
+            <h5>Renderer Process</h5>
+            <pre>
+                <code>
+const shell = require('electron').shell
+
+const links = document.querySelectorAll('a[href]')
+
+Array.prototype.forEach.call(links, (link) => {
+  const url = link.getAttribute('href')
+  if (url.indexOf('http') === 0) {
+    link.addEventListener('click', (e) => {
+      e.preventDefault()
+      shell.openExternal(url)
+    })
+  }
+})
+                </code>
+              </pre>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
+  </body>
+</html>

docs/fiddles/native-ui/external-links-file-manager/main.js

@@ -0,0 +1,56 @@
+// Modules to control application life and create native browser window
+const { app, BrowserWindow } = require('electron')
+
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow
+
+function createWindow () {
+  // Create the browser window.
+  mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      nodeIntegration: true
+    }
+  })
+
+  // and load the index.html of the app.
+  mainWindow.loadFile('index.html')
+
+  // Open the DevTools.
+  // mainWindow.webContents.openDevTools()
+
+  // Emitted when the window is closed.
+  mainWindow.on('closed', function () {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    mainWindow = null
+  })
+}
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', createWindow)
+
+// Quit when all windows are closed.
+app.on('window-all-closed', function () {
+  // On OS X it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+})
+
+app.on('activate', function () {
+  // On OS X it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (mainWindow === null) {
+    createWindow()
+  }
+})
+
+// In this file you can include the rest of your app's specific main process
+// code. You can also put them in separate files and require them here.

docs/fiddles/native-ui/external-links-file-manager/renderer.js

@@ -0,0 +1,13 @@
+const { shell } = require('electron')
+const os = require('os')
+
+const exLinksBtn = document.getElementById('open-ex-links')
+const fileManagerBtn = document.getElementById('open-file-manager')
+
+fileManagerBtn.addEventListener('click', (event) => {
+  shell.showItemInFolder(os.homedir())
+})
+
+exLinksBtn.addEventListener('click', (event) => {
+  shell.openExternal('http://electron.atom.io')
+})

docs/fiddles/native-ui/tray/index.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>Tray</title>
+  </head>
+  <body>
+    <div>
+      <h1>Tray</h1>
+      <h3>
+        The <code>tray</code> module allows you to create an icon in the
+        operating system's notification area.
+      </h3>
+      <p>This icon can also have a context menu attached.</p>
+
+      <p>
+        Open the
+        <a href="http://electron.atom.io/docs/api/tray">
+          full API documentation (opens in new window)
+        </a>
+        in your browser.
+      </p>
+    </div>
+
+    <div>
+      <div>
+        <div>
+          <div>
+            <button id="put-in-tray">View Demo</button>
+            <span id="tray-countdown"></span>
+          </div>
+          <p>
+            The demo button sends a message to the main process using the
+            <code>ipc</code> module. In the main process the app is told to
+            place an icon, with a context menu, in the tray.
+          </p>
+
+          <p>
+            In this example the tray icon can be removed by clicking 'Remove' in
+            the context menu or selecting the demo button again.
+          </p>
+          <h5>Main Process</h5>
+          <pre>
+              <code>
+const path = require('path')
+const {ipcMain, app, Menu, Tray} = require('electron')
+
+let appIcon = null
+
+ipcMain.on('put-in-tray', (event) => {
+  const iconName = process.platform === 'win32' ? 'windows-icon.png' : 'iconTemplate.png'
+  const iconPath = path.join(__dirname, iconName)
+  appIcon = new Tray(iconPath)
+
+  const contextMenu = Menu.buildFromTemplate([{
+    label: 'Remove',
+    click: () => {
+      event.sender.send('tray-removed')
+    }
+  }])
+
+  appIcon.setToolTip('Electron Demo in the tray.')
+  appIcon.setContextMenu(contextMenu)
+})
+
+ipcMain.on('remove-tray', () => {
+  appIcon.destroy()
+})
+
+app.on('window-all-closed', () => {
+  if (appIcon) appIcon.destroy()
+})
+              </code>
+            </pre>
+          <h5>Renderer Process</h5>
+          <pre>
+              <code>
+const ipc = require('electron').ipcRenderer
+
+const trayBtn = document.getElementById('put-in-tray')
+let trayOn = false
+
+trayBtn.addEventListener('click', function (event) {
+  if (trayOn) {
+    trayOn = false
+    document.getElementById('tray-countdown').innerHTML = ''
+    ipc.send('remove-tray')
+  } else {
+    trayOn = true
+    const message = 'Click demo again to remove.'
+    document.getElementById('tray-countdown').innerHTML = message
+    ipc.send('put-in-tray')
+  }
+})
+// Tray removed from context menu on icon
+ipc.on('tray-removed', function () {
+  ipc.send('remove-tray')
+  trayOn = false
+  document.getElementById('tray-countdown').innerHTML = ''
+})                  
+              </code>
+            </pre>
+
+          <div>
+            <h2>ProTip</h2>
+            <strong>Tray support in Linux.</strong>
+            <p>
+              On Linux distributions that only have app indicator support, users
+              will need to install <code>libappindicator1</code> to make the
+              tray icon work. See the
+              <a href="http://electron.atom.io/docs/api/tray">
+                full API documentation (opens in new window)
+              </a>
+              for more details about using Tray on Linux.
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
+  </body>
+</html>

docs/fiddles/native-ui/tray/renderer.js

@@ -0,0 +1,35 @@
+const { ipcRenderer, shell } = require('electron')
+
+const trayBtn = document.getElementById('put-in-tray')
+const links = document.querySelectorAll('a[href]')
+
+let trayOn = false
+
+trayBtn.addEventListener('click', function (event) {
+  if (trayOn) {
+    trayOn = false
+    document.getElementById('tray-countdown').innerHTML = ''
+    ipcRenderer.send('remove-tray')
+  } else {
+    trayOn = true
+    const message = 'Click demo again to remove.'
+    document.getElementById('tray-countdown').innerHTML = message
+    ipcRenderer.send('put-in-tray')
+  }
+})
+// Tray removed from context menu on icon
+ipcRenderer.on('tray-removed', function () {
+  ipcRenderer.send('remove-tray')
+  trayOn = false
+  document.getElementById('tray-countdown').innerHTML = ''
+})
+
+Array.prototype.forEach.call(links, (link) => {
+  const url = link.getAttribute('href')
+  if (url.indexOf('http') === 0) {
+    link.addEventListener('click', (e) => {
+      e.preventDefault()
+      shell.openExternal(url)
+    })
+  }
+})

docs/tutorial/code-signing.md

@@ -3,7 +3,7 @@
 Code signing is a security technology that you use to certify that an app was
 created by you.
 
-On macOS the system can detect any change to the  app, whether the change is
+On macOS the system can detect any change to the app, whether the change is
 introduced accidentally or by malicious code.
 
 On Windows the system assigns a trust level to your code signing certificate which
@@ -11,15 +11,18 @@ if you don't have, or if your trust level is low will cause security dialogs to
 appear when users start using your application.  Trust level builds over time
 so it's better to start code signing as early as possible.
 
-While it is possible to distribute unsigned apps, it is not recommended.
-For example, here's what macOS users see when attempting to start an unsigned app:
+While it is possible to distribute unsigned apps, it is not recommended. Both
+Windows and macOS will, by default, prevent either the download or the
+execution of unsigned applications. Starting with macOS Catalina (version 10.15),
+users have to go through multiple manual steps to open unsigned applications.
 
-![unsigned app warning on macOS](https://user-images.githubusercontent.com/2289/39488937-bdc854ba-4d38-11e8-88f8-7b3c125baefc.png)
+![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
 
-> App can't be opened because it is from an unidentified developer
+As you can see, users get two options: Move the app straight to the trash or
+cancel running it. You don't want your users to see that dialog.
 
 If you are building an Electron app that you intend to package and distribute,
-it should be code signed. The Mac and Windows app stores do not allow unsigned
+it should be code-signed. The Mac and Windows app stores do not allow unsigned
 apps.
 
 # Signing macOS builds
@@ -39,7 +42,20 @@ pass the `--osx-sign=true` flag to sign your build.
     in your forge config.
 - [`electron-builder`] has built-in code-signing capabilities. See [electron.build/code-signing](https://www.electron.build/code-signing)
 
-For more info, see the [Mac App Store Submission Guide].
+## Notarization
+
+Starting with macOS Catalina, Apple requires applications to be notarized.
+"Notarization" as defined by Apple means that you upload your previously signed
+application to Apple for additional verification _before_ distributing the app
+to your users.
+
+To automate this process, you can use the [`electron-notarize`] module. You
+do not necessarily need to complete this step for every build you make – just
+the builds you intend to ship to users.
+
+## Mac App Store
+
+See the [Mac App Store Guide].
 
 # Signing Windows builds
 
@@ -70,8 +86,9 @@ See the [Windows Store Guide].
 [`electron-forge`]: https://github.com/electron-userland/electron-forge
 [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
+[`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
 [Xcode]: https://developer.apple.com/xcode
-[signing certificates]: https://github.com/electron-userland/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[Mac App Store Submission Guide]: mac-app-store-submission-guide.md
+[signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
+[Mac App Store Guide]: mac-app-store-submission-guide.md
 [Windows Store Guide]: windows-store-guide.md

docs/tutorial/devtools-extension.md

@@ -34,7 +34,7 @@ Using the [React Developer Tools][react-devtools] as example:
    const os = require('os')
 
    BrowserWindow.addDevToolsExtension(
-      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/0.15.0_0')
+      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.3.0_0')
    )
    ```
 

docs/tutorial/installation.md

@@ -56,7 +56,7 @@ can do so by either providing a mirror or an existing cache directory.
 
 #### Mirror
 You can use environment variables to override the base URL, the path at which to
-look for Electron binaries, and the binary filename. The url used by `electron-download`
+look for Electron binaries, and the binary filename. The url used by `@electron/get`
 is composed as follows:
 
 ```plaintext
@@ -70,7 +70,7 @@ ELECTRON_MIRROR="https://cdn.npm.taobao.org/dist/electron/"
 ```
 
 #### Cache
-Alternatively, you can override the local cache. `electron-download` will cache
+Alternatively, you can override the local cache. `@electron/get` will cache
 downloaded binaries in a local directory to not stress your network. You can use
 that cache folder to provide custom builds of Electron or to avoid making contact
 with the network at all.
@@ -82,23 +82,33 @@ with the network at all.
 On environments that have been using older versions of Electron, you might find the
 cache also in `~/.electron`.
 
-You can also override the local cache location by providing a `ELECTRON_CACHE`
+You can also override the local cache location by providing a `electron_config_cache`
 environment variable.
 
 The cache contains the version's official zip file as well as a checksum, stored as
 a text file. A typical cache might look like this:
 
 ```sh
-├── electron-v1.7.9-darwin-x64.zip
-├── electron-v1.8.1-darwin-x64.zip
-├── electron-v1.8.2-beta.1-darwin-x64.zip
-├── electron-v1.8.2-beta.2-darwin-x64.zip
-├── electron-v1.8.2-beta.3-darwin-x64.zip
-├── SHASUMS256.txt-1.7.9
-├── SHASUMS256.txt-1.8.1
-├── SHASUMS256.txt-1.8.2-beta.1
-├── SHASUMS256.txt-1.8.2-beta.2
-├── SHASUMS256.txt-1.8.2-beta.3
+├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9electron-v1.7.9-darwin-x64.zip
+│   └── electron-v1.7.9-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.7.9SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1electron-v1.8.1-darwin-x64.zip
+│   └── electron-v1.8.1-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.1SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1electron-v1.8.2-beta.1-darwin-x64.zip
+│   └── electron-v1.8.2-beta.1-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.1SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2electron-v1.8.2-beta.2-darwin-x64.zip
+│   └── electron-v1.8.2-beta.2-darwin-x64.zip
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.2SHASUMS256.txt
+│   └── SHASUMS256.txt
+├── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3electron-v1.8.2-beta.3-darwin-x64.zip
+│   └── electron-v1.8.2-beta.3-darwin-x64.zip
+└── httpsgithub.comelectronelectronreleasesdownloadv1.8.2-beta.3SHASUMS256.txt
+    └── SHASUMS256.txt
 ```
 
 ## Skip binary download

docs/tutorial/mojave-dark-mode-guide.md

@@ -21,12 +21,12 @@ If your app has its own dark mode you should toggle it on and off in sync with t
 this by listening for the theme changed event on Electron's `systemPreferences` module.  E.g.
 
 ```js
-const { systemPreferences } = require('electron')
+const { nativeTheme } = require('electron')
 
 systemPreferences.subscribeNotification(
   'AppleInterfaceThemeChangedNotification',
   function theThemeHasChanged () {
-    updateMyAppTheme(systemPreferences.isDarkMode())
+    updateMyAppTheme(nativeTheme.shouldUseDarkColors)
   }
 )
 ```

docs/tutorial/security.md

@@ -241,7 +241,7 @@ prevent the use of Node primitives, `contextIsolation` must also be used.
 
 ### Why?
 
-Context isolation allows each the scripts on running in the renderer to make
+Context isolation allows each of the scripts running in the renderer to make
 changes to its JavaScript environment without worrying about conflicting with
 the scripts in the Electron API or the preload script.
 
@@ -422,8 +422,6 @@ on a page directly in the markup using a `<meta>` tag:
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'">
 ```
 
-#### `webRequest.onHeadersReceived([filter, ]listener)`
-
 
 ## 7) Do Not Set `allowRunningInsecureContent` to `true`
 

filenames.auto.gni

@@ -165,6 +165,7 @@ auto_filenames = {
     "lib/renderer/web-view/web-view-element.ts",
     "lib/renderer/web-view/web-view-impl.ts",
     "lib/renderer/web-view/web-view-init.ts",
+    "lib/renderer/window-setup.ts",
     "lib/sandboxed_renderer/api/exports/electron.ts",
     "lib/sandboxed_renderer/api/module-list.ts",
     "lib/sandboxed_renderer/init.js",

filenames.gni

@@ -433,10 +433,8 @@ filenames = {
     "shell/common/api/atom_api_native_image_mac.mm",
     "shell/common/api/atom_api_shell.cc",
     "shell/common/api/atom_api_v8_util.cc",
-    "shell/common/api/constructor.h",
     "shell/common/api/electron_bindings.cc",
     "shell/common/api/electron_bindings.h",
-    "shell/common/api/constructor.h",
     "shell/common/api/features.cc",
     "shell/common/application_info.cc",
     "shell/common/application_info.h",
@@ -496,6 +494,7 @@ filenames = {
     "shell/common/gin_helper/arguments.h",
     "shell/common/gin_helper/callback.cc",
     "shell/common/gin_helper/callback.h",
+    "shell/common/gin_helper/constructor.h",
     "shell/common/gin_helper/destroyable.cc",
     "shell/common/gin_helper/destroyable.h",
     "shell/common/gin_helper/dictionary.h",
@@ -517,6 +516,9 @@ filenames = {
     "shell/common/gin_helper/promise.cc",
     "shell/common/gin_helper/trackable_object.cc",
     "shell/common/gin_helper/trackable_object.h",
+    "shell/common/gin_helper/wrappable.cc",
+    "shell/common/gin_helper/wrappable.h",
+    "shell/common/gin_helper/wrappable_base.h",
     "shell/common/heap_snapshot.cc",
     "shell/common/heap_snapshot.h",
     "shell/common/keyboard_util.cc",

lib/browser/api/browser-window.js

@@ -116,7 +116,7 @@ BrowserWindow.getFocusedWindow = () => {
 
 BrowserWindow.fromWebContents = (webContents) => {
   for (const window of BrowserWindow.getAllWindows()) {
-    if (window.webContents.equal(webContents)) return window
+    if (window.webContents && window.webContents.equal(webContents)) return window
   }
 
   return null

lib/browser/api/dialog.js

@@ -163,6 +163,7 @@ const messageBox = (sync, window, options) => {
     defaultId = -1,
     detail = '',
     icon = null,
+    noLink = false,
     message = '',
     title = '',
     type = 'none'
@@ -173,6 +174,7 @@ const messageBox = (sync, window, options) => {
   if (!Array.isArray(buttons)) throw new TypeError('Buttons must be an array')
   if (options.normalizeAccessKeys) buttons = buttons.map(normalizeAccessKey)
   if (typeof title !== 'string') throw new TypeError('Title must be a string')
+  if (typeof noLink !== 'boolean') throw new TypeError('noLink must be a boolean')
   if (typeof message !== 'string') throw new TypeError('Message must be a string')
   if (typeof detail !== 'string') throw new TypeError('Detail must be a string')
   if (typeof checkboxLabel !== 'string') throw new TypeError('checkboxLabel must be a string')
@@ -195,15 +197,13 @@ const messageBox = (sync, window, options) => {
     }
   }
 
-  const flags = options.noLink ? messageBoxOptions.noLink : 0
-
   const settings = {
     window,
     messageBoxType,
     buttons,
     defaultId,
     cancelId,
-    flags,
+    noLink,
     title,
     message,
     detail,

lib/browser/api/net.js

@@ -398,7 +398,7 @@ class ClientRequest extends Writable {
           this.emit('redirect', statusCode, newMethod, newUrl, headers)
         } finally {
           this._followRedirectCb = null
-          if (!_followRedirect) {
+          if (!_followRedirect && !this._aborted) {
             this._die(new Error('Redirect was cancelled'))
           }
         }
@@ -454,7 +454,7 @@ class ClientRequest extends Writable {
   }
 
   getUploadProgress () {
-    return { ...this._uploadProgress } || { active: false }
+    return this._uploadProgress ? { ...this._uploadProgress } : { active: false }
   }
 }
 

lib/browser/api/web-contents.js

@@ -7,6 +7,7 @@ const path = require('path')
 const url = require('url')
 const { app, ipcMain, session, deprecate } = electron
 
+const { internalWindowOpen } = require('@electron/internal/browser/guest-window-manager')
 const NavigationController = require('@electron/internal/browser/navigation-controller')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
@@ -173,7 +174,6 @@ const webFrameMethods = [
   'insertCSS',
   'insertText',
   'removeInsertedCSS',
-  'setLayoutZoomLevelLimits',
   'setVisualZoomLevelLimits'
 ]
 
@@ -276,6 +276,7 @@ WebContents.prototype.getPrinters = function () {
     return this._getPrinters()
   } else {
     console.error('Error: Printing feature is disabled.')
+    return []
   }
 }
 
@@ -397,9 +398,7 @@ WebContents.prototype._init = function () {
         width: 800,
         height: 600
       }
-      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
-        event, url, referrer, frameName, disposition,
-        options, additionalFeatures, postData)
+      internalWindowOpen(event, url, referrer, frameName, disposition, options, additionalFeatures, postData)
     })
 
     // Create a new browser window for the native implementation of
@@ -421,8 +420,7 @@ WebContents.prototype._init = function () {
         webContents
       }
       const referrer = { url: '', policy: 'default' }
-      ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN',
-        event, url, referrer, frameName, disposition, options)
+      internalWindowOpen(event, url, referrer, frameName, disposition, options)
     })
   }
 

lib/browser/guest-window-manager.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { BrowserWindow, webContents } = require('electron')
+const electron = require('electron')
+const { BrowserWindow } = electron
 const { isSameOrigin } = process.electronBinding('v8_util')
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
@@ -74,8 +75,10 @@ const mergeBrowserWindowOptions = function (embedder, options) {
     }
   }
 
-  // Sets correct openerId here to give correct options to 'new-window' event handler
-  options.webPreferences.openerId = embedder.id
+  if (!webPreferences.nativeWindowOpen) {
+    // Sets correct openerId here to give correct options to 'new-window' event handler
+    options.webPreferences.openerId = embedder.id
+  }
 
   return options
 }
@@ -244,13 +247,11 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, url, fra
   }
 
   const referrer = { url: '', policy: 'default' }
-  ipcMainInternal.emit('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', event,
-    url, referrer, frameName, disposition, options, additionalFeatures)
+  internalWindowOpen(event, url, referrer, frameName, disposition, options, additionalFeatures)
 })
 
 // Routed window.open messages with fully parsed options
-ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', function (event, url, referrer,
-  frameName, disposition, options, additionalFeatures, postData) {
+function internalWindowOpen (event, url, referrer, frameName, disposition, options, additionalFeatures, postData) {
   options = mergeBrowserWindowOptions(event.sender, options)
   event.sender.emit('new-window', event, url, frameName, disposition, options, additionalFeatures, referrer)
   const { newGuest } = event
@@ -268,11 +269,12 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', functio
   } else {
     event.returnValue = createGuest(event.sender, url, referrer, frameName, options, postData)
   }
-})
+}
 
 const makeSafeHandler = function (handler) {
   return (event, guestId, ...args) => {
-    const guestContents = webContents.fromId(guestId)
+    // Access webContents via electron to prevent circular require.
+    const guestContents = electron.webContents.fromId(guestId)
     if (!guestContents) {
       throw new Error(`Invalid guestId: ${guestId}`)
     }
@@ -289,8 +291,8 @@ const handleMessageSync = function (channel, handler) {
   ipcMainUtils.handleSync(channel, makeSafeHandler(handler))
 }
 
-const assertCanAccessWindow = function (contents, guestContents) {
-  if (!canAccessWindow(contents, guestContents)) {
+const securityCheck = function (contents, guestContents, check) {
+  if (!check(contents, guestContents)) {
     console.error(`Blocked ${contents.getURL()} from accessing guestId: ${guestContents.id}`)
     throw new Error(`Access denied to guestId: ${guestContents.id}`)
   }
@@ -303,7 +305,7 @@ const windowMethods = new Set([
 ])
 
 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!windowMethods.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -321,6 +323,8 @@ handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', (event, guestC
   // The W3C does not seem to have word on how postMessage should work when the
   // origins do not match, so we do not do |canAccessWindow| check here since
   // postMessage across origins is useful and not harmful.
+  securityCheck(event.sender, guestContents, isRelatedWindow)
+
   if (targetOrigin === '*' || isSameOrigin(guestContents.getURL(), targetOrigin)) {
     const sourceId = event.sender.id
     guestContents._sendInternal('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin)
@@ -334,7 +338,7 @@ const webContentsMethodsAsync = new Set([
 ])
 
 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!webContentsMethodsAsync.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -349,7 +353,7 @@ const webContentsMethodsSync = new Set([
 ])
 
 handleMessageSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
-  assertCanAccessWindow(event.sender, guestContents)
+  securityCheck(event.sender, guestContents, canAccessWindow)
 
   if (!webContentsMethodsSync.has(method)) {
     console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -358,3 +362,5 @@ handleMessageSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, g
 
   return guestContents[method](...args)
 })
+
+exports.internalWindowOpen = internalWindowOpen

lib/browser/init.ts

@@ -195,13 +195,14 @@ app.on('window-all-closed', () => {
   }
 })
 
-Promise.all([
-  import('@electron/internal/browser/default-menu'),
-  app.whenReady()
-]).then(([{ setDefaultApplicationMenu }]) => {
-  // Create default menu
-  setDefaultApplicationMenu()
-})
+const { setDefaultApplicationMenu } = require('@electron/internal/browser/default-menu')
+
+// Create default menu.
+//
+// Note that the task must be added before loading any app, so we can make sure
+// the call is maded before any user window is created, otherwise the default
+// menu may show even when user explicitly hides the menu.
+app.once('ready', setDefaultApplicationMenu)
 
 if (packagePath) {
   // Finally load app's main.js and transfer control to C++.

lib/browser/rpc-server.js

@@ -112,11 +112,15 @@ ipcMainUtils.handleSync('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event)
     contentScripts = getContentScripts()
   }
 
+  const webPreferences = event.sender.getLastWebPreferences() || {}
+
   return {
     contentScripts,
     preloadScripts: await Promise.all(preloadPaths.map(path => getPreloadScript(path))),
     isRemoteModuleEnabled: isRemoteModuleEnabled(event.sender),
     isWebViewTagEnabled: guestViewManager.isWebViewTagEnabled(event.sender),
+    guestInstanceId: webPreferences.guestInstanceId,
+    openerId: webPreferences.openerId,
     process: {
       arch: process.arch,
       platform: process.platform,

lib/common/crash-reporter.js

@@ -54,7 +54,12 @@ class CrashReporter {
   }
 
   getUploadedReports () {
-    return binding.getUploadedReports(this.getCrashesDirectory())
+    const crashDir = this.getCrashesDirectory()
+    if (!crashDir) {
+      throw new Error('crashReporter has not been started')
+    }
+
+    return binding.getUploadedReports(crashDir)
   }
 
   getCrashesDirectory () {

lib/renderer/init.ts

@@ -192,6 +192,8 @@ if (nodeIntegration) {
       delete global.setImmediate
       delete global.clearImmediate
       delete global.global
+      delete global.root
+      delete global.GLOBAL
     })
   }
 }

lib/renderer/window-setup.ts

@@ -177,7 +177,7 @@ class BrowserWindowProxy {
 export const windowSetup = (
   guestInstanceId: number, openerId: number, isHiddenPage: boolean, usesNativeWindowOpen: boolean
 ) => {
-  if (guestInstanceId == null) {
+  if (!process.sandboxed && guestInstanceId == null) {
     // Override default window.close.
     window.close = function () {
       ipcRendererInternal.send('ELECTRON_BROWSER_WINDOW_CLOSE')
@@ -197,10 +197,10 @@ export const windowSetup = (
         return null
       }
     }
+  }
 
-    if (openerId != null) {
-      window.opener = getOrCreateProxy(openerId)
-    }
+  if (openerId != null) {
+    window.opener = getOrCreateProxy(openerId)
   }
 
   // But we do not support prompt().
@@ -208,42 +208,47 @@ export const windowSetup = (
     throw new Error('prompt() is and will not be supported.')
   }
 
-  ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
-    _event, sourceId: number, message: any, sourceOrigin: string
-  ) {
-    // Manually dispatch event instead of using postMessage because we also need to
-    // set event.source.
-    //
-    // Why any? We can't construct a MessageEvent and we can't
-    // use `as MessageEvent` because you're not supposed to override
-    // data, origin, and source
-    const event: any = document.createEvent('Event')
-    event.initEvent('message', false, false)
+  if (!usesNativeWindowOpen || openerId != null) {
+    ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
+      _event, sourceId: number, message: any, sourceOrigin: string
+    ) {
+      // Manually dispatch event instead of using postMessage because we also need to
+      // set event.source.
+      //
+      // Why any? We can't construct a MessageEvent and we can't
+      // use `as MessageEvent` because you're not supposed to override
+      // data, origin, and source
+      const event: any = document.createEvent('Event')
+      event.initEvent('message', false, false)
 
-    event.data = message
-    event.origin = sourceOrigin
-    event.source = getOrCreateProxy(sourceId)
+      event.data = message
+      event.origin = sourceOrigin
+      event.source = getOrCreateProxy(sourceId)
 
-    window.dispatchEvent(event as MessageEvent)
-  })
-
-  window.history.back = function () {
-    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_BACK')
+      window.dispatchEvent(event as MessageEvent)
+    })
   }
 
-  window.history.forward = function () {
-    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_FORWARD')
-  }
-
-  window.history.go = function (offset: number) {
-    ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_TO_OFFSET', +offset)
-  }
-
-  Object.defineProperty(window.history, 'length', {
-    get: function () {
-      return ipcRendererInternal.sendSync('ELECTRON_NAVIGATION_CONTROLLER_LENGTH')
+  if (!process.sandboxed) {
+    window.history.back = function () {
+      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_BACK')
     }
-  })
+
+    window.history.forward = function () {
+      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_FORWARD')
+    }
+
+    window.history.go = function (offset: number) {
+      ipcRendererInternal.send('ELECTRON_NAVIGATION_CONTROLLER_GO_TO_OFFSET', +offset)
+    }
+
+    Object.defineProperty(window.history, 'length', {
+      get: function () {
+        return ipcRendererInternal.sendSync('ELECTRON_NAVIGATION_CONTROLLER_LENGTH')
+      },
+      set () {}
+    })
+  }
 
   if (guestInstanceId != null) {
     // Webview `document.visibilityState` tracks window visibility (and ignores

lib/sandboxed_renderer/init.js

@@ -30,7 +30,13 @@ const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-rendere
 const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils')
 
 const {
-  contentScripts, preloadScripts, isRemoteModuleEnabled, isWebViewTagEnabled, process: processProps
+  contentScripts,
+  preloadScripts,
+  isRemoteModuleEnabled,
+  isWebViewTagEnabled,
+  guestInstanceId,
+  openerId,
+  process: processProps
 } = ipcRendererUtils.invokeSync('ELECTRON_BROWSER_SANDBOX_LOAD')
 
 process.isRemoteModuleEnabled = isRemoteModuleEnabled
@@ -109,6 +115,11 @@ function preloadRequire (module) {
 const { hasSwitch } = process.electronBinding('command_line')
 
 const contextIsolation = hasSwitch('context-isolation')
+const isHiddenPage = hasSwitch('hidden-page')
+const usesNativeWindowOpen = true
+
+// The arguments to be passed to isolated world.
+const isolatedWorldArgs = { ipcRendererInternal, guestInstanceId, isHiddenPage, openerId, usesNativeWindowOpen }
 
 switch (window.location.protocol) {
   case 'devtools:': {
@@ -127,6 +138,10 @@ switch (window.location.protocol) {
     break
   }
   default: {
+    // Override default web functions.
+    const { windowSetup } = require('@electron/internal/renderer/window-setup')
+    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
+
     // Inject content scripts.
     if (!process.electronBinding('features').isExtensionsEnabled()) {
       require('@electron/internal/renderer/content-scripts-injector')(contentScripts)
@@ -134,14 +149,17 @@ switch (window.location.protocol) {
   }
 }
 
-const guestInstanceId = binding.guestInstanceId && parseInt(binding.guestInstanceId)
-
 // Load webview tag implementation.
 if (process.isMainFrame) {
   const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init')
   webViewInit(contextIsolation, isWebViewTagEnabled, guestInstanceId)
 }
 
+// Pass the arguments to isolatedWorld.
+if (contextIsolation) {
+  v8Util.setHiddenValue(global, 'isolated-world-args', isolatedWorldArgs)
+}
+
 // Wrap the script into a function executed in global scope. It won't have
 // access to the current scope, so we'll expose a few objects as arguments:
 //

native_mate/BUILD.gn

@@ -1,32 +0,0 @@
-config("native_mate_config") {
-  include_dirs = [ "." ]
-}
-
-source_set("native_mate") {
-  deps = [
-    "//base",
-    "//net",
-    "//third_party/electron_node:node_lib",
-    "//v8:v8_headers",
-  ]
-  public_configs = [ ":native_mate_config" ]
-  include_dirs = [ ".." ]
-  sources = [
-    "native_mate/arguments.cc",
-    "native_mate/arguments.h",
-    "native_mate/compat.h",
-    "native_mate/constructor.h",
-    "native_mate/converter.cc",
-    "native_mate/converter.h",
-    "native_mate/dictionary.cc",
-    "native_mate/dictionary.h",
-    "native_mate/function_template.cc",
-    "native_mate/function_template.h",
-    "native_mate/handle.h",
-    "native_mate/object_template_builder.cc",
-    "native_mate/object_template_builder_deprecated.h",
-    "native_mate/wrappable.cc",
-    "native_mate/wrappable.h",
-    "native_mate/wrappable_base.h",
-  ]
-}

native_mate/LICENSE.chromium

@@ -1,27 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

native_mate/README.md

@@ -1,56 +0,0 @@
-> A fork of Chromium's [gin library][chromium-gin-lib] that makes it easier to
-> marshal types between C++ and JavaScript.
-
-# Overview
-
-`native-mate` was forked from `gin` so that it could be used in
-[Electron][electron] without conflicting with Node's Environment. It has also
-been extended to allow Electron to create classes in JavaScript.
-
-With the help of Chromium's `base` library, `native-mate` makes writing JS
-bindings very easy, and most of the intricate details of converting V8 types
-to C++ types and back are taken care of auto-magically. In most cases there's
-no need to use the raw V8 API to implement an API binding.
-
-For example, here's an API binding that doesn't use `native-mate`:
-
-```c++
-// static
-void Shell::OpenItem(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  base::FilePath file_path;
-  if (!FromV8Arguments(args, &file_path))
-    return node::ThrowTypeError("Bad argument");
-
-  platform_util::OpenItem(file_path);
-}
-
-// static
-void Shell::Initialize(v8::Handle<v8::Object> target) {
-  NODE_SET_METHOD(target, "openItem", OpenItem);
-}
-```
-
-And here's the same API binding using `native-mate`:
-
-```c++
-void Initialize(v8::Handle<v8::Object> exports) {
-  mate::Dictionary dict(v8::Isolate::GetCurrent(), exports);
-  dict.SetMethod("openItem", &platform_util::OpenItem);
-}
-```
-
-# Code Structure
-
-* `converter.h` - Templatized JS<->C++ conversion routines for many common C++
-  types. You can define your own by specializing `Converter`.
-* `function_template.h` - Create JavaScript functions that dispatch to any C++
-  function, member function pointer, or `base::Callback`.
-* `object_template_builder_deprecated.h` - A handy utility for creation of `v8::ObjectTemplate`.
-* `wrappable.h` - Base class for C++ classes that want to be owned by the V8 GC.
-  Wrappable objects are automatically deleted when GC discovers that nothing in
-  the V8 heap refers to them. This is also an easy way to expose C++ objects to
-  JavaScript.
-
-
-[chromium-gin-lib]: https://code.google.com/p/chromium/codesearch#chromium/src/gin/README.md&sq=package:chromium
-[electron]: https://electronjs.org/

native_mate/native_mate/arguments.cc

@@ -1,61 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#include "native_mate/arguments.h"
-
-#include "base/strings/stringprintf.h"
-#include "native_mate/converter.h"
-
-namespace mate {
-
-namespace {
-
-std::string V8TypeAsString(v8::Isolate* isolate, v8::Local<v8::Value> value) {
-  if (value.IsEmpty())
-    return "<empty handle>";
-  v8::MaybeLocal<v8::String> details =
-      value->ToDetailString(isolate->GetCurrentContext());
-  std::string result;
-  if (!details.IsEmpty())
-    ConvertFromV8(isolate, details.ToLocalChecked(), &result);
-  return result;
-}
-
-}  // namespace
-
-Arguments::Arguments() = default;
-
-Arguments::Arguments(const v8::FunctionCallbackInfo<v8::Value>& info)
-    : isolate_(info.GetIsolate()), info_(&info) {}
-
-Arguments::~Arguments() = default;
-
-v8::Local<v8::Value> Arguments::PeekNext() const {
-  if (next_ >= info_->Length())
-    return v8::Local<v8::Value>();
-  return (*info_)[next_];
-}
-
-v8::Local<v8::Value> Arguments::ThrowError() const {
-  if (insufficient_arguments_)
-    return ThrowTypeError("Insufficient number of arguments.");
-
-  return ThrowTypeError(base::StringPrintf(
-      "Error processing argument at index %d, conversion failure from %s",
-      next_, V8TypeAsString(isolate_, (*info_)[next_]).c_str()));
-}
-
-v8::Local<v8::Value> Arguments::ThrowError(const std::string& message) const {
-  isolate_->ThrowException(v8::Exception::Error(StringToV8(isolate_, message)));
-  return v8::Undefined(isolate_);
-}
-
-v8::Local<v8::Value> Arguments::ThrowTypeError(
-    const std::string& message) const {
-  isolate_->ThrowException(
-      v8::Exception::TypeError(StringToV8(isolate_, message)));
-  return v8::Undefined(isolate_);
-}
-
-}  // namespace mate

native_mate/native_mate/arguments.h

@@ -1,111 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_ARGUMENTS_H_
-#define NATIVE_MATE_NATIVE_MATE_ARGUMENTS_H_
-
-#include <string>
-#include <vector>
-
-#include "base/macros.h"
-#include "base/optional.h"
-#include "native_mate/converter.h"
-
-// =============================== NOTICE ===============================
-// Do not add code here, native_mate is being removed. Any new code
-// should use gin instead.
-
-namespace mate {
-
-// Arguments is a wrapper around v8::FunctionCallbackInfo that integrates
-// with Converter to make it easier to marshall arguments and return values
-// between V8 and C++.
-class Arguments {
- public:
-  Arguments();
-  explicit Arguments(const v8::FunctionCallbackInfo<v8::Value>& info);
-  ~Arguments();
-
-  v8::Local<v8::Object> GetHolder() const { return info_->Holder(); }
-
-  template <typename T>
-  bool GetHolder(T* out) {
-    return mate::ConvertFromV8(isolate_, info_->Holder(), out);
-  }
-
-  template <typename T>
-  bool GetData(T* out) {
-    return ConvertFromV8(isolate_, info_->Data(), out);
-  }
-
-  template <typename T>
-  bool GetNext(base::Optional<T>* out) {
-    if (next_ >= info_->Length())
-      return true;
-    v8::Local<v8::Value> val = (*info_)[next_];
-    bool success = ConvertFromV8(isolate_, val, out);
-    if (success)
-      next_++;
-    return success;
-  }
-
-  template <typename T>
-  bool GetNext(T* out) {
-    if (next_ >= info_->Length()) {
-      insufficient_arguments_ = true;
-      return false;
-    }
-    v8::Local<v8::Value> val = (*info_)[next_];
-    bool success = mate::ConvertFromV8(isolate_, val, out);
-    if (success)
-      next_++;
-    return success;
-  }
-
-  template <typename T>
-  bool GetRemaining(std::vector<T>* out) {
-    if (next_ >= info_->Length()) {
-      insufficient_arguments_ = true;
-      return false;
-    }
-    int remaining = info_->Length() - next_;
-    out->resize(remaining);
-    for (int i = 0; i < remaining; ++i) {
-      v8::Local<v8::Value> val = (*info_)[next_++];
-      if (!ConvertFromV8(isolate_, val, &out->at(i)))
-        return false;
-    }
-    return true;
-  }
-
-  v8::Local<v8::Object> GetThis() { return info_->This(); }
-
-  bool IsConstructCall() const { return info_->IsConstructCall(); }
-
-  int Length() const { return info_->Length(); }
-
-  template <typename T>
-  void Return(const T& val) {
-    info_->GetReturnValue().Set(ConvertToV8(isolate_, val));
-  }
-
-  v8::Local<v8::Value> PeekNext() const;
-
-  v8::Local<v8::Value> ThrowError() const;
-  v8::Local<v8::Value> ThrowError(const std::string& message) const;
-  v8::Local<v8::Value> ThrowTypeError(const std::string& message) const;
-
-  v8::Isolate* isolate() const { return isolate_; }
-  const v8::FunctionCallbackInfo<v8::Value>& info() const { return *info_; }
-
- private:
-  v8::Isolate* isolate_ = nullptr;
-  const v8::FunctionCallbackInfo<v8::Value>* info_ = nullptr;
-  int next_ = 0;
-  bool insufficient_arguments_ = false;
-};
-
-}  // namespace mate
-
-#endif  // NATIVE_MATE_NATIVE_MATE_ARGUMENTS_H_

native_mate/native_mate/converter.cc

@@ -1,269 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#include "native_mate/converter.h"
-
-#include "v8/include/v8.h"
-
-namespace mate {
-
-namespace {
-
-template <typename T, typename U>
-bool FromMaybe(v8::Maybe<T> maybe, U* out) {
-  if (maybe.IsNothing())
-    return false;
-  *out = static_cast<U>(maybe.FromJust());
-  return true;
-}
-
-}  // namespace
-
-v8::Local<v8::Value> Converter<bool>::ToV8(v8::Isolate* isolate, bool val) {
-  return v8::Boolean::New(isolate, val);
-}
-
-bool Converter<bool>::FromV8(v8::Isolate* isolate,
-                             v8::Local<v8::Value> val,
-                             bool* out) {
-  if (!val->IsBoolean())
-    return false;
-  *out = val.As<v8::Boolean>()->Value();
-  return true;
-}
-
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
-v8::Local<v8::Value> Converter<unsigned long>::ToV8(  // NOLINT(runtime/int)
-    v8::Isolate* isolate,
-    unsigned long val) {  // NOLINT(runtime/int)
-  return v8::Integer::New(isolate, val);
-}
-
-bool Converter<unsigned long>::FromV8(  // NOLINT(runtime/int)
-    v8::Isolate* isolate,
-    v8::Local<v8::Value> val,
-    unsigned long* out) {  // NOLINT(runtime/int)
-  if (!val->IsNumber())
-    return false;
-  return FromMaybe(val->IntegerValue(isolate->GetCurrentContext()), out);
-}
-#endif
-
-v8::Local<v8::Value> Converter<int32_t>::ToV8(v8::Isolate* isolate,
-                                              int32_t val) {
-  return v8::Integer::New(isolate, val);
-}
-
-bool Converter<int32_t>::FromV8(v8::Isolate* isolate,
-                                v8::Local<v8::Value> val,
-                                int32_t* out) {
-  if (!val->IsInt32())
-    return false;
-  *out = val.As<v8::Int32>()->Value();
-  return true;
-}
-
-v8::Local<v8::Value> Converter<uint32_t>::ToV8(v8::Isolate* isolate,
-                                               uint32_t val) {
-  return v8::Integer::NewFromUnsigned(isolate, val);
-}
-
-bool Converter<uint32_t>::FromV8(v8::Isolate* isolate,
-                                 v8::Local<v8::Value> val,
-                                 uint32_t* out) {
-  if (!val->IsUint32())
-    return false;
-  *out = val.As<v8::Uint32>()->Value();
-  return true;
-}
-
-v8::Local<v8::Value> Converter<int64_t>::ToV8(v8::Isolate* isolate,
-                                              int64_t val) {
-  return v8::Number::New(isolate, static_cast<double>(val));
-}
-
-bool Converter<int64_t>::FromV8(v8::Isolate* isolate,
-                                v8::Local<v8::Value> val,
-                                int64_t* out) {
-  if (!val->IsNumber())
-    return false;
-  // Even though IntegerValue returns int64_t, JavaScript cannot represent
-  // the full precision of int64_t, which means some rounding might occur.
-  return FromMaybe(val->IntegerValue(isolate->GetCurrentContext()), out);
-}
-
-v8::Local<v8::Value> Converter<uint64_t>::ToV8(v8::Isolate* isolate,
-                                               uint64_t val) {
-  return v8::Number::New(isolate, static_cast<double>(val));
-}
-
-bool Converter<uint64_t>::FromV8(v8::Isolate* isolate,
-                                 v8::Local<v8::Value> val,
-                                 uint64_t* out) {
-  if (!val->IsNumber())
-    return false;
-  return FromMaybe(val->IntegerValue(isolate->GetCurrentContext()), out);
-}
-
-v8::Local<v8::Value> Converter<float>::ToV8(v8::Isolate* isolate, float val) {
-  return v8::Number::New(isolate, val);
-}
-
-bool Converter<float>::FromV8(v8::Isolate* isolate,
-                              v8::Local<v8::Value> val,
-                              float* out) {
-  if (!val->IsNumber())
-    return false;
-  *out = static_cast<float>(val.As<v8::Number>()->Value());
-  return true;
-}
-
-v8::Local<v8::Value> Converter<double>::ToV8(v8::Isolate* isolate, double val) {
-  return v8::Number::New(isolate, val);
-}
-
-bool Converter<double>::FromV8(v8::Isolate* isolate,
-                               v8::Local<v8::Value> val,
-                               double* out) {
-  if (!val->IsNumber())
-    return false;
-  *out = val.As<v8::Number>()->Value();
-  return true;
-}
-
-v8::Local<v8::Value> Converter<const char*>::ToV8(v8::Isolate* isolate,
-                                                  const char* val) {
-  return v8::String::NewFromUtf8(isolate, val, v8::NewStringType::kNormal)
-      .ToLocalChecked();
-}
-
-v8::Local<v8::Value> Converter<base::StringPiece>::ToV8(v8::Isolate* isolate,
-                                                        base::StringPiece val) {
-  return v8::String::NewFromUtf8(isolate, val.data(),
-                                 v8::NewStringType::kNormal,
-                                 static_cast<uint32_t>(val.length()))
-      .ToLocalChecked();
-}
-
-v8::Local<v8::Value> Converter<std::string>::ToV8(v8::Isolate* isolate,
-                                                  const std::string& val) {
-  return Converter<base::StringPiece>::ToV8(isolate, val);
-}
-
-bool Converter<std::string>::FromV8(v8::Isolate* isolate,
-                                    v8::Local<v8::Value> val,
-                                    std::string* out) {
-  if (!val->IsString())
-    return false;
-  v8::Local<v8::String> str = v8::Local<v8::String>::Cast(val);
-  int length = str->Utf8Length(isolate);
-  out->resize(length);
-  str->WriteUtf8(isolate, &(*out)[0], length, nullptr,
-                 v8::String::NO_NULL_TERMINATION);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::Function>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::Function> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::Function>>::FromV8(v8::Isolate* isolate,
-                                                v8::Local<v8::Value> val,
-                                                v8::Local<v8::Function>* out) {
-  if (!val->IsFunction())
-    return false;
-  *out = v8::Local<v8::Function>::Cast(val);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::Object>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::Object>>::FromV8(v8::Isolate* isolate,
-                                              v8::Local<v8::Value> val,
-                                              v8::Local<v8::Object>* out) {
-  if (!val->IsObject())
-    return false;
-  *out = v8::Local<v8::Object>::Cast(val);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::String>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::String> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::String>>::FromV8(v8::Isolate* isolate,
-                                              v8::Local<v8::Value> val,
-                                              v8::Local<v8::String>* out) {
-  if (!val->IsString())
-    return false;
-  *out = v8::Local<v8::String>::Cast(val);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::External>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::External> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::External>>::FromV8(v8::Isolate* isolate,
-                                                v8::Local<v8::Value> val,
-                                                v8::Local<v8::External>* out) {
-  if (!val->IsExternal())
-    return false;
-  *out = v8::Local<v8::External>::Cast(val);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::Array>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::Array> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::Array>>::FromV8(v8::Isolate* isolate,
-                                             v8::Local<v8::Value> val,
-                                             v8::Local<v8::Array>* out) {
-  if (!val->IsArray())
-    return false;
-  *out = v8::Local<v8::Array>::Cast(val);
-  return true;
-}
-
-v8::Local<v8::Value> Converter<v8::Local<v8::Value>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::Value> val) {
-  return val;
-}
-
-v8::Local<v8::Promise> Converter<v8::Local<v8::Promise>>::ToV8(
-    v8::Isolate* isolate,
-    v8::Local<v8::Promise> val) {
-  return val;
-}
-
-bool Converter<v8::Local<v8::Value>>::FromV8(v8::Isolate* isolate,
-                                             v8::Local<v8::Value> val,
-                                             v8::Local<v8::Value>* out) {
-  *out = val;
-  return true;
-}
-
-v8::Local<v8::String> StringToSymbol(v8::Isolate* isolate,
-                                     base::StringPiece val) {
-  return v8::String::NewFromUtf8(isolate, val.data(),
-                                 v8::NewStringType::kInternalized,
-                                 static_cast<uint32_t>(val.length()))
-      .ToLocalChecked();
-}
-
-}  // namespace mate

native_mate/native_mate/converter.h

@@ -1,351 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_CONVERTER_H_
-#define NATIVE_MATE_NATIVE_MATE_CONVERTER_H_
-
-#include <map>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "base/strings/string_piece.h"
-#include "gin/converter.h"
-#include "v8/include/v8.h"
-
-namespace mate {
-
-template <typename KeyType>
-bool SetProperty(v8::Isolate* isolate,
-                 v8::Local<v8::Object> object,
-                 KeyType key,
-                 v8::Local<v8::Value> value) {
-  auto maybe = object->Set(isolate->GetCurrentContext(), key, value);
-  return !maybe.IsNothing() && maybe.FromJust();
-}
-
-template <typename T>
-struct ToV8ReturnsMaybe {
-  static const bool value = false;
-};
-
-template <typename T, typename Enable = void>
-struct Converter {};
-
-template <>
-struct Converter<void*> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, void* val) {
-    return v8::Undefined(isolate);
-  }
-};
-
-template <>
-struct Converter<std::nullptr_t> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, std::nullptr_t val) {
-    return v8::Null(isolate);
-  }
-};
-
-template <>
-struct Converter<bool> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, bool val);
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, bool* out);
-};
-
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
-template <>
-struct Converter<unsigned long> {  // NOLINT(runtime/int)
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   unsigned long val);  // NOLINT(runtime/int)
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     unsigned long* out);  // NOLINT(runtime/int)
-};
-#endif
-
-template <>
-struct Converter<int32_t> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, int32_t val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     int32_t* out);
-};
-
-template <>
-struct Converter<uint32_t> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, uint32_t val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     uint32_t* out);
-};
-
-template <>
-struct Converter<int64_t> {
-  // Warning: JavaScript cannot represent 64 integers precisely.
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, int64_t val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     int64_t* out);
-};
-
-template <>
-struct Converter<uint64_t> {
-  // Warning: JavaScript cannot represent 64 integers precisely.
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, uint64_t val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     uint64_t* out);
-};
-
-template <>
-struct Converter<float> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, float val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     float* out);
-};
-
-template <>
-struct Converter<double> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, double val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     double* out);
-};
-
-template <>
-struct Converter<const char*> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const char* val);
-};
-
-template <>
-struct Converter<base::StringPiece> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, base::StringPiece val);
-  // No conversion out is possible because StringPiece does not contain storage.
-};
-
-template <>
-struct Converter<std::string> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const std::string& val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     std::string* out);
-};
-
-v8::Local<v8::String> StringToSymbol(v8::Isolate* isolate,
-                                     base::StringPiece input);
-
-template <>
-struct Converter<v8::Local<v8::Function>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::Function> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::Function>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::Object>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::Object> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::Object>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::String>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::String> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::String>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::External>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::External> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::External>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::Array>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::Array> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::Array>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::Value>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   v8::Local<v8::Value> val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     v8::Local<v8::Value>* out);
-};
-
-template <>
-struct Converter<v8::Local<v8::Promise>> {
-  static v8::Local<v8::Promise> ToV8(v8::Isolate* isolate,
-                                     v8::Local<v8::Promise> val);
-  // static bool FromV8(v8::Isolate* isolate,
-  //                    v8::Local<v8::Value> val,
-  //                    v8::Local<v8::Value>* out);
-};
-
-template <typename T>
-struct Converter<std::vector<T>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const std::vector<T>& val) {
-    v8::Local<v8::Array> result(
-        v8::Array::New(isolate, static_cast<int>(val.size())));
-    auto context = isolate->GetCurrentContext();
-    for (size_t i = 0; i < val.size(); ++i) {
-      result
-          ->Set(context, static_cast<int>(i),
-                Converter<T>::ToV8(isolate, val[i]))
-          .Check();
-    }
-    return result;
-  }
-
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     std::vector<T>* out) {
-    if (!val->IsArray())
-      return false;
-
-    auto context = isolate->GetCurrentContext();
-    std::vector<T> result;
-    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
-    uint32_t length = array->Length();
-    for (uint32_t i = 0; i < length; ++i) {
-      T item;
-      if (!Converter<T>::FromV8(isolate,
-                                array->Get(context, i).ToLocalChecked(), &item))
-        return false;
-      result.push_back(item);
-    }
-
-    out->swap(result);
-    return true;
-  }
-};
-
-template <typename T>
-struct Converter<std::set<T>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const std::set<T>& val) {
-    v8::Local<v8::Array> result(
-        v8::Array::New(isolate, static_cast<int>(val.size())));
-    auto context = isolate->GetCurrentContext();
-    typename std::set<T>::const_iterator it;
-    int i;
-    for (i = 0, it = val.begin(); it != val.end(); ++it, ++i)
-      result->Set(context, i, Converter<T>::ToV8(isolate, *it)).Check();
-    return result;
-  }
-
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     std::set<T>* out) {
-    if (!val->IsArray())
-      return false;
-
-    auto context = isolate->GetCurrentContext();
-    std::set<T> result;
-    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
-    uint32_t length = array->Length();
-    for (uint32_t i = 0; i < length; ++i) {
-      T item;
-      if (!Converter<T>::FromV8(isolate,
-                                array->Get(context, i).ToLocalChecked(), &item))
-        return false;
-      result.insert(item);
-    }
-
-    out->swap(result);
-    return true;
-  }
-};
-
-// Convenience functions that deduce T.
-template <typename T>
-v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate, const T& input) {
-  return Converter<T>::ToV8(isolate, input);
-}
-
-template <typename T>
-v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate, T&& input) {
-  return Converter<typename std::remove_reference<T>::type>::ToV8(
-      isolate, std::move(input));
-}
-
-inline v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate,
-                                        const char* input) {
-  return Converter<const char*>::ToV8(isolate, input);
-}
-
-template <typename T>
-v8::MaybeLocal<v8::Value> ConvertToV8(v8::Local<v8::Context> context,
-                                      const T& input) {
-  return Converter<T>::ToV8(context, input);
-}
-
-template <typename T, bool = ToV8ReturnsMaybe<T>::value>
-struct ToV8Traits;
-
-template <typename T>
-struct ToV8Traits<T, true> {
-  static bool TryConvertToV8(v8::Isolate* isolate,
-                             const T& input,
-                             v8::Local<v8::Value>* output) {
-    auto maybe = ConvertToV8(isolate->GetCurrentContext(), input);
-    if (maybe.IsEmpty())
-      return false;
-    *output = maybe.ToLocalChecked();
-    return true;
-  }
-};
-
-template <typename T>
-struct ToV8Traits<T, false> {
-  static bool TryConvertToV8(v8::Isolate* isolate,
-                             const T& input,
-                             v8::Local<v8::Value>* output) {
-    *output = ConvertToV8(isolate, input);
-    return true;
-  }
-};
-
-template <typename T>
-bool TryConvertToV8(v8::Isolate* isolate,
-                    const T& input,
-                    v8::Local<v8::Value>* output) {
-  return ToV8Traits<T>::TryConvertToV8(isolate, input, output);
-}
-
-template <typename T>
-bool ConvertFromV8(v8::Isolate* isolate,
-                   v8::Local<v8::Value> input,
-                   T* result) {
-  return Converter<T>::FromV8(isolate, input, result);
-}
-
-inline v8::Local<v8::String> StringToV8(v8::Isolate* isolate,
-                                        base::StringPiece input) {
-  return ConvertToV8(isolate, input).As<v8::String>();
-}
-
-}  // namespace mate
-
-#endif  // NATIVE_MATE_NATIVE_MATE_CONVERTER_H_

native_mate/native_mate/dictionary.cc

@@ -1,40 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#include "native_mate/dictionary.h"
-
-namespace mate {
-
-Dictionary::Dictionary() = default;
-
-Dictionary::Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object)
-    : isolate_(isolate), object_(object) {}
-
-Dictionary::Dictionary(const Dictionary& other) = default;
-
-Dictionary::~Dictionary() = default;
-
-Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) {
-  return Dictionary(isolate, v8::Object::New(isolate));
-}
-
-v8::Local<v8::Object> Dictionary::GetHandle() const {
-  return object_;
-}
-
-v8::Local<v8::Value> Converter<Dictionary>::ToV8(v8::Isolate* isolate,
-                                                 Dictionary val) {
-  return val.GetHandle();
-}
-
-bool Converter<Dictionary>::FromV8(v8::Isolate* isolate,
-                                   v8::Local<v8::Value> val,
-                                   Dictionary* out) {
-  if (!val->IsObject() || val->IsFunction())
-    return false;
-  *out = Dictionary(isolate, v8::Local<v8::Object>::Cast(val));
-  return true;
-}
-
-}  // namespace mate

native_mate/native_mate/dictionary.h

@@ -1,136 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_DICTIONARY_H_
-#define NATIVE_MATE_NATIVE_MATE_DICTIONARY_H_
-
-#include "native_mate/converter.h"
-#include "native_mate/object_template_builder_deprecated.h"
-
-namespace mate {
-
-namespace internal {
-
-// Returns true if |maybe| is both a value, and that value is true.
-inline bool IsTrue(v8::Maybe<bool> maybe) {
-  return maybe.IsJust() && maybe.FromJust();
-}
-
-}  // namespace internal
-
-// Dictionary is useful when writing bindings for a function that either
-// receives an arbitrary JavaScript object as an argument or returns an
-// arbitrary JavaScript object as a result. For example, Dictionary is useful
-// when you might use the |dictionary| type in WebIDL:
-//
-//   http://heycam.github.io/webidl/#idl-dictionaries
-//
-// WARNING: You cannot retain a Dictionary object in the heap. The underlying
-//          storage for Dictionary is tied to the closest enclosing
-//          v8::HandleScope. Generally speaking, you should store a Dictionary
-//          on the stack.
-//
-class Dictionary {
- public:
-  Dictionary();
-  Dictionary(v8::Isolate* isolate, v8::Local<v8::Object> object);
-  Dictionary(const Dictionary& other);
-  virtual ~Dictionary();
-
-  static Dictionary CreateEmpty(v8::Isolate* isolate);
-
-  template <typename T>
-  bool Get(base::StringPiece key, T* out) const {
-    // Check for existence before getting, otherwise this method will always
-    // returns true when T == v8::Local<v8::Value>.
-    v8::Local<v8::Context> context = isolate_->GetCurrentContext();
-    v8::Local<v8::String> v8_key = StringToV8(isolate_, key);
-    if (!internal::IsTrue(GetHandle()->Has(context, v8_key)))
-      return false;
-
-    v8::Local<v8::Value> val;
-    if (!GetHandle()->Get(context, v8_key).ToLocal(&val))
-      return false;
-    return ConvertFromV8(isolate_, val, out);
-  }
-
-  template <typename T>
-  bool Set(base::StringPiece key, const T& val) {
-    v8::Local<v8::Value> v8_value;
-    if (!TryConvertToV8(isolate_, val, &v8_value))
-      return false;
-    v8::Maybe<bool> result = GetHandle()->Set(
-        isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value);
-    return !result.IsNothing() && result.FromJust();
-  }
-
-  template <typename T>
-  bool SetReadOnly(base::StringPiece key, T val) {
-    v8::Local<v8::Value> v8_value;
-    if (!TryConvertToV8(isolate_, val, &v8_value))
-      return false;
-    v8::Maybe<bool> result = GetHandle()->DefineOwnProperty(
-        isolate_->GetCurrentContext(), StringToV8(isolate_, key), v8_value,
-        v8::ReadOnly);
-    return !result.IsNothing() && result.FromJust();
-  }
-
-  template <typename T>
-  bool SetMethod(base::StringPiece key, const T& callback) {
-    return GetHandle()
-        ->Set(isolate_->GetCurrentContext(), StringToV8(isolate_, key),
-              CallbackTraits<T>::CreateTemplate(isolate_, callback)
-                  ->GetFunction(isolate_->GetCurrentContext())
-                  .ToLocalChecked())
-        .ToChecked();
-  }
-
-  bool Delete(base::StringPiece key) {
-    v8::Maybe<bool> result = GetHandle()->Delete(isolate_->GetCurrentContext(),
-                                                 StringToV8(isolate_, key));
-    return !result.IsNothing() && result.FromJust();
-  }
-
-  bool IsEmpty() const { return isolate() == NULL; }
-
-  virtual v8::Local<v8::Object> GetHandle() const;
-
-  v8::Isolate* isolate() const { return isolate_; }
-
- protected:
-  v8::Isolate* isolate_ = nullptr;
-
- private:
-  v8::Local<v8::Object> object_;
-};
-
-template <>
-struct Converter<Dictionary> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, Dictionary val);
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     Dictionary* out);
-};
-
-}  // namespace mate
-
-namespace gin {
-
-// Keep compatibility with gin.
-template <>
-struct Converter<mate::Dictionary> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const mate::Dictionary& in) {
-    return mate::ConvertToV8(isolate, in);
-  }
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     mate::Dictionary* out) {
-    return mate::ConvertFromV8(isolate, val, out);
-  }
-};
-
-}  // namespace gin
-
-#endif  // NATIVE_MATE_NATIVE_MATE_DICTIONARY_H_

native_mate/native_mate/function_template.cc

@@ -1,40 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#include "native_mate/function_template.h"
-
-namespace mate {
-
-namespace internal {
-
-CallbackHolderBase::CallbackHolderBase(v8::Isolate* isolate)
-    : v8_ref_(isolate, v8::External::New(isolate, this)) {
-  v8_ref_.SetWeak(this, &CallbackHolderBase::FirstWeakCallback,
-                  v8::WeakCallbackType::kParameter);
-}
-
-CallbackHolderBase::~CallbackHolderBase() {
-  DCHECK(v8_ref_.IsEmpty());
-}
-
-v8::Local<v8::External> CallbackHolderBase::GetHandle(v8::Isolate* isolate) {
-  return v8::Local<v8::External>::New(isolate, v8_ref_);
-}
-
-// static
-void CallbackHolderBase::FirstWeakCallback(
-    const v8::WeakCallbackInfo<CallbackHolderBase>& data) {
-  data.GetParameter()->v8_ref_.Reset();
-  data.SetSecondPassCallback(SecondWeakCallback);
-}
-
-// static
-void CallbackHolderBase::SecondWeakCallback(
-    const v8::WeakCallbackInfo<CallbackHolderBase>& data) {
-  delete data.GetParameter();
-}
-
-}  // namespace internal
-
-}  // namespace mate

native_mate/native_mate/function_template.h

@@ -1,285 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
-#define NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
-
-#include "base/callback.h"
-#include "native_mate/arguments.h"
-#include "native_mate/wrappable_base.h"
-#include "shell/common/gin_helper/destroyable.h"
-#include "shell/common/gin_helper/error_thrower.h"
-
-// =============================== NOTICE ===============================
-// Do not add code here, native_mate is being removed. Any new code
-// should use gin instead.
-
-namespace mate {
-
-enum CreateFunctionTemplateFlags {
-  HolderIsFirstArgument = 1 << 0,
-};
-
-namespace internal {
-
-template <typename T>
-struct CallbackParamTraits {
-  typedef T LocalType;
-};
-template <typename T>
-struct CallbackParamTraits<const T&> {
-  typedef T LocalType;
-};
-template <typename T>
-struct CallbackParamTraits<const T*> {
-  typedef T* LocalType;
-};
-
-// CallbackHolder and CallbackHolderBase are used to pass a base::Callback from
-// CreateFunctionTemplate through v8 (via v8::FunctionTemplate) to
-// DispatchToCallback, where it is invoked.
-
-// This simple base class is used so that we can share a single object template
-// among every CallbackHolder instance.
-class CallbackHolderBase {
- public:
-  v8::Local<v8::External> GetHandle(v8::Isolate* isolate);
-
- protected:
-  explicit CallbackHolderBase(v8::Isolate* isolate);
-  virtual ~CallbackHolderBase();
-
- private:
-  static void FirstWeakCallback(
-      const v8::WeakCallbackInfo<CallbackHolderBase>& data);
-  static void SecondWeakCallback(
-      const v8::WeakCallbackInfo<CallbackHolderBase>& data);
-
-  v8::Global<v8::External> v8_ref_;
-
-  DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase);
-};
-
-template <typename Sig>
-class CallbackHolder : public CallbackHolderBase {
- public:
-  CallbackHolder(v8::Isolate* isolate,
-                 const base::Callback<Sig>& callback,
-                 int flags)
-      : CallbackHolderBase(isolate), callback(callback), flags(flags) {}
-  base::Callback<Sig> callback;
-  int flags = 0;
-
- private:
-  virtual ~CallbackHolder() = default;
-
-  DISALLOW_COPY_AND_ASSIGN(CallbackHolder);
-};
-
-template <typename T>
-bool GetNextArgument(Arguments* args,
-                     int create_flags,
-                     bool is_first,
-                     T* result) {
-  if (is_first && (create_flags & HolderIsFirstArgument) != 0) {
-    return args->GetHolder(result);
-  } else {
-    return args->GetNext(result);
-  }
-}
-
-// For advanced use cases, we allow callers to request the unparsed Arguments
-// object and poke around in it directly.
-inline bool GetNextArgument(Arguments* args,
-                            int create_flags,
-                            bool is_first,
-                            Arguments* result) {
-  *result = *args;
-  return true;
-}
-inline bool GetNextArgument(Arguments* args,
-                            int create_flags,
-                            bool is_first,
-                            Arguments** result) {
-  *result = args;
-  return true;
-}
-
-// It's common for clients to just need the isolate, so we make that easy.
-inline bool GetNextArgument(Arguments* args,
-                            int create_flags,
-                            bool is_first,
-                            v8::Isolate** result) {
-  *result = args->isolate();
-  return true;
-}
-
-// Allow clients to pass a util::Error to throw errors if they
-// don't need the full mate::Arguments
-inline bool GetNextArgument(Arguments* args,
-                            int create_flags,
-                            bool is_first,
-                            gin_helper::ErrorThrower* result) {
-  *result = gin_helper::ErrorThrower(args->isolate());
-  return true;
-}
-
-// Classes for generating and storing an argument pack of integer indices
-// (based on well-known "indices trick", see: http://goo.gl/bKKojn):
-template <size_t... indices>
-struct IndicesHolder {};
-
-template <size_t requested_index, size_t... indices>
-struct IndicesGenerator {
-  using type = typename IndicesGenerator<requested_index - 1,
-                                         requested_index - 1,
-                                         indices...>::type;
-};
-template <size_t... indices>
-struct IndicesGenerator<0, indices...> {
-  using type = IndicesHolder<indices...>;
-};
-
-// Class template for extracting and storing single argument for callback
-// at position |index|.
-template <size_t index, typename ArgType>
-struct ArgumentHolder {
-  using ArgLocalType = typename CallbackParamTraits<ArgType>::LocalType;
-
-  ArgLocalType value;
-  bool ok = false;
-
-  ArgumentHolder(Arguments* args, int create_flags) {
-    if (index == 0 && (create_flags & HolderIsFirstArgument) &&
-        gin_helper::Destroyable::IsDestroyed(args->GetHolder())) {
-      args->ThrowError("Object has been destroyed");
-      return;
-    }
-    ok = GetNextArgument(args, create_flags, index == 0, &value);
-    if (!ok) {
-      // Ideally we would include the expected c++ type in the error
-      // message which we can access via typeid(ArgType).name()
-      // however we compile with no-rtti, which disables typeid.
-      args->ThrowError();
-    }
-  }
-};
-
-// Class template for converting arguments from JavaScript to C++ and running
-// the callback with them.
-template <typename IndicesType, typename... ArgTypes>
-class Invoker {};
-
-template <size_t... indices, typename... ArgTypes>
-class Invoker<IndicesHolder<indices...>, ArgTypes...>
-    : public ArgumentHolder<indices, ArgTypes>... {
- public:
-  // Invoker<> inherits from ArgumentHolder<> for each argument.
-  // C++ has always been strict about the class initialization order,
-  // so it is guaranteed ArgumentHolders will be initialized (and thus, will
-  // extract arguments from Arguments) in the right order.
-  Invoker(Arguments* args, int create_flags)
-      : ArgumentHolder<indices, ArgTypes>(args, create_flags)..., args_(args) {
-    // GCC thinks that create_flags is going unused, even though the
-    // expansion above clearly makes use of it. Per jyasskin@, casting
-    // to void is the commonly accepted way to convince the compiler
-    // that you're actually using a parameter/varible.
-    (void)create_flags;
-  }
-
-  bool IsOK() { return And(ArgumentHolder<indices, ArgTypes>::ok...); }
-
-  template <typename ReturnType>
-  void DispatchToCallback(base::Callback<ReturnType(ArgTypes...)> callback) {
-    v8::MicrotasksScope script_scope(args_->isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    args_->Return(callback.Run(ArgumentHolder<indices, ArgTypes>::value...));
-  }
-
-  // In C++, you can declare the function foo(void), but you can't pass a void
-  // expression to foo. As a result, we must specialize the case of Callbacks
-  // that have the void return type.
-  void DispatchToCallback(base::Callback<void(ArgTypes...)> callback) {
-    v8::MicrotasksScope script_scope(args_->isolate(),
-                                     v8::MicrotasksScope::kRunMicrotasks);
-    callback.Run(ArgumentHolder<indices, ArgTypes>::value...);
-  }
-
- private:
-  static bool And() { return true; }
-  template <typename... T>
-  static bool And(bool arg1, T... args) {
-    return arg1 && And(args...);
-  }
-
-  Arguments* args_;
-};
-
-// DispatchToCallback converts all the JavaScript arguments to C++ types and
-// invokes the base::Callback.
-template <typename Sig>
-struct Dispatcher {};
-
-template <typename ReturnType, typename... ArgTypes>
-struct Dispatcher<ReturnType(ArgTypes...)> {
-  static void DispatchToCallback(
-      const v8::FunctionCallbackInfo<v8::Value>& info) {
-    Arguments args(info);
-    v8::Local<v8::External> v8_holder;
-    args.GetData(&v8_holder);
-    CallbackHolderBase* holder_base =
-        reinterpret_cast<CallbackHolderBase*>(v8_holder->Value());
-
-    typedef CallbackHolder<ReturnType(ArgTypes...)> HolderT;
-    HolderT* holder = static_cast<HolderT*>(holder_base);
-
-    using Indices = typename IndicesGenerator<sizeof...(ArgTypes)>::type;
-    Invoker<Indices, ArgTypes...> invoker(&args, holder->flags);
-    if (invoker.IsOK())
-      invoker.DispatchToCallback(holder->callback);
-  }
-};
-
-}  // namespace internal
-
-// CreateFunctionTemplate creates a v8::FunctionTemplate that will create
-// JavaScript functions that execute a provided C++ function or base::Callback.
-// JavaScript arguments are automatically converted via gin::Converter, as is
-// the return value of the C++ function, if any.
-//
-// NOTE: V8 caches FunctionTemplates for a lifetime of a web page for its own
-// internal reasons, thus it is generally a good idea to cache the template
-// returned by this function.  Otherwise, repeated method invocations from JS
-// will create substantial memory leaks. See http://crbug.com/463487.
-template <typename Sig>
-v8::Local<v8::FunctionTemplate> CreateFunctionTemplate(
-    v8::Isolate* isolate,
-    const base::Callback<Sig> callback,
-    int callback_flags = 0) {
-  typedef internal::CallbackHolder<Sig> HolderT;
-  HolderT* holder = new HolderT(isolate, callback, callback_flags);
-
-  return v8::FunctionTemplate::New(
-      isolate, &internal::Dispatcher<Sig>::DispatchToCallback,
-      ConvertToV8<v8::Local<v8::External>>(isolate,
-                                           holder->GetHandle(isolate)));
-}
-
-// CreateFunctionHandler installs a CallAsFunction handler on the given
-// object template that forwards to a provided C++ function or base::Callback.
-template <typename Sig>
-void CreateFunctionHandler(v8::Isolate* isolate,
-                           v8::Local<v8::ObjectTemplate> tmpl,
-                           const base::Callback<Sig> callback,
-                           int callback_flags = 0) {
-  typedef internal::CallbackHolder<Sig> HolderT;
-  HolderT* holder = new HolderT(isolate, callback, callback_flags);
-  tmpl->SetCallAsFunctionHandler(&internal::Dispatcher<Sig>::DispatchToCallback,
-                                 ConvertToV8<v8::Local<v8::External>>(
-                                     isolate, holder->GetHandle(isolate)));
-}
-
-}  // namespace mate
-
-#endif  // NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_

native_mate/native_mate/handle.h

@@ -1,90 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_HANDLE_H_
-#define NATIVE_MATE_NATIVE_MATE_HANDLE_H_
-
-#include "native_mate/converter.h"
-
-namespace mate {
-
-// You can use mate::Handle on the stack to retain a mate::Wrappable object.
-// Currently we don't have a mechanism for retaining a mate::Wrappable object
-// in the C++ heap because strong references from C++ to V8 can cause memory
-// leaks.
-template <typename T>
-class Handle {
- public:
-  Handle() = default;
-
-  Handle(v8::Local<v8::Object> wrapper, T* object)
-      : wrapper_(wrapper), object_(object) {}
-
-  bool IsEmpty() const { return !object_; }
-
-  void Clear() {
-    wrapper_.Clear();
-    object_ = NULL;
-  }
-
-  T* operator->() const { return object_; }
-  v8::Local<v8::Object> ToV8() const { return wrapper_; }
-  T* get() const { return object_; }
-
- private:
-  v8::Local<v8::Object> wrapper_;
-  T* object_ = nullptr;
-};
-
-template <typename T>
-struct Converter<mate::Handle<T>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const mate::Handle<T>& val) {
-    return val.ToV8();
-  }
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     mate::Handle<T>* out) {
-    T* object = NULL;
-    if (val->IsNull() || val->IsUndefined()) {
-      *out = mate::Handle<T>();
-      return true;
-    }
-    if (!Converter<T*>::FromV8(isolate, val, &object)) {
-      return false;
-    }
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
-    *out = mate::Handle<T>(val->ToObject(context).ToLocalChecked(), object);
-    return true;
-  }
-};
-
-// This function is a convenient way to create a handle from a raw pointer
-// without having to write out the type of the object explicitly.
-template <typename T>
-mate::Handle<T> CreateHandle(v8::Isolate* isolate, T* object) {
-  return mate::Handle<T>(object->GetWrapper(), object);
-}
-
-}  // namespace mate
-
-namespace gin {
-
-// Keep compatibility with gin.
-template <typename T>
-struct Converter<mate::Handle<T>> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const mate::Handle<T>& in) {
-    return mate::ConvertToV8(isolate, in);
-  }
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     mate::Handle<T>* out) {
-    return mate::ConvertFromV8(isolate, val, out);
-  }
-};
-
-}  // namespace gin
-
-#endif  // NATIVE_MATE_NATIVE_MATE_HANDLE_H_

native_mate/native_mate/object_template_builder.cc

@@ -1,37 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#include "native_mate/object_template_builder_deprecated.h"
-
-namespace mate {
-
-ObjectTemplateBuilder::ObjectTemplateBuilder(
-    v8::Isolate* isolate,
-    v8::Local<v8::ObjectTemplate> templ)
-    : isolate_(isolate), template_(templ) {}
-
-ObjectTemplateBuilder::~ObjectTemplateBuilder() = default;
-
-ObjectTemplateBuilder& ObjectTemplateBuilder::SetImpl(base::StringPiece name,
-                                                      v8::Local<v8::Data> val) {
-  template_->Set(StringToSymbol(isolate_, name), val);
-  return *this;
-}
-
-ObjectTemplateBuilder& ObjectTemplateBuilder::SetPropertyImpl(
-    base::StringPiece name,
-    v8::Local<v8::FunctionTemplate> getter,
-    v8::Local<v8::FunctionTemplate> setter) {
-  template_->SetAccessorProperty(StringToSymbol(isolate_, name), getter,
-                                 setter);
-  return *this;
-}
-
-v8::Local<v8::ObjectTemplate> ObjectTemplateBuilder::Build() {
-  v8::Local<v8::ObjectTemplate> result = template_;
-  template_.Clear();
-  return result;
-}
-
-}  // namespace mate

native_mate/native_mate/object_template_builder_deprecated.h

@@ -1,120 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE.chromium file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_OBJECT_TEMPLATE_BUILDER_DEPRECATED_H_
-#define NATIVE_MATE_NATIVE_MATE_OBJECT_TEMPLATE_BUILDER_DEPRECATED_H_
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/strings/string_piece.h"
-#include "native_mate/converter.h"
-#include "native_mate/function_template.h"
-#include "v8/include/v8.h"
-
-namespace mate {
-
-// Base template - used only for non-member function pointers. Other types
-// either go to one of the below specializations, or go here and fail to compile
-// because of base::Bind().
-template <typename T, typename Enable = void>
-struct CallbackTraits {
-  static v8::Local<v8::FunctionTemplate> CreateTemplate(v8::Isolate* isolate,
-                                                        T callback) {
-    return mate::CreateFunctionTemplate(isolate, base::Bind(callback));
-  }
-};
-
-// Specialization for base::Callback.
-template <typename T>
-struct CallbackTraits<base::Callback<T>> {
-  static v8::Local<v8::FunctionTemplate> CreateTemplate(
-      v8::Isolate* isolate,
-      const base::Callback<T>& callback) {
-    return mate::CreateFunctionTemplate(isolate, callback);
-  }
-};
-
-// Specialization for member function pointers. We need to handle this case
-// specially because the first parameter for callbacks to MFP should typically
-// come from the the JavaScript "this" object the function was called on, not
-// from the first normal parameter.
-template <typename T>
-struct CallbackTraits<
-    T,
-    typename std::enable_if<std::is_member_function_pointer<T>::value>::type> {
-  static v8::Local<v8::FunctionTemplate> CreateTemplate(v8::Isolate* isolate,
-                                                        T callback) {
-    int flags = HolderIsFirstArgument;
-    return mate::CreateFunctionTemplate(isolate, base::Bind(callback), flags);
-  }
-};
-
-// This specialization allows people to construct function templates directly if
-// they need to do fancier stuff.
-template <>
-struct CallbackTraits<v8::Local<v8::FunctionTemplate>> {
-  static v8::Local<v8::FunctionTemplate> CreateTemplate(
-      v8::Local<v8::FunctionTemplate> templ) {
-    return templ;
-  }
-};
-
-// ObjectTemplateBuilder provides a handy interface to creating
-// v8::ObjectTemplate instances with various sorts of properties.
-class ObjectTemplateBuilder {
- public:
-  explicit ObjectTemplateBuilder(v8::Isolate* isolate,
-                                 v8::Local<v8::ObjectTemplate> templ);
-  ~ObjectTemplateBuilder();
-
-  // It's against Google C++ style to return a non-const ref, but we take some
-  // poetic license here in order that all calls to Set() can be via the '.'
-  // operator and line up nicely.
-  template <typename T>
-  ObjectTemplateBuilder& SetValue(base::StringPiece name, T val) {
-    return SetImpl(name, ConvertToV8(isolate_, val));
-  }
-
-  // In the following methods, T and U can be function pointer, member function
-  // pointer, base::Callback, or v8::FunctionTemplate. Most clients will want to
-  // use one of the first two options. Also see mate::CreateFunctionTemplate()
-  // for creating raw function templates.
-  template <typename T>
-  ObjectTemplateBuilder& SetMethod(base::StringPiece name, T callback) {
-    return SetImpl(name, CallbackTraits<T>::CreateTemplate(isolate_, callback));
-  }
-  template <typename T>
-  ObjectTemplateBuilder& SetProperty(base::StringPiece name, T getter) {
-    return SetPropertyImpl(name,
-                           CallbackTraits<T>::CreateTemplate(isolate_, getter),
-                           v8::Local<v8::FunctionTemplate>());
-  }
-  template <typename T, typename U>
-  ObjectTemplateBuilder& SetProperty(base::StringPiece name,
-                                     T getter,
-                                     U setter) {
-    return SetPropertyImpl(name,
-                           CallbackTraits<T>::CreateTemplate(isolate_, getter),
-                           CallbackTraits<U>::CreateTemplate(isolate_, setter));
-  }
-
-  v8::Local<v8::ObjectTemplate> Build();
-
- private:
-  ObjectTemplateBuilder& SetImpl(base::StringPiece name,
-                                 v8::Local<v8::Data> val);
-  ObjectTemplateBuilder& SetPropertyImpl(
-      base::StringPiece name,
-      v8::Local<v8::FunctionTemplate> getter,
-      v8::Local<v8::FunctionTemplate> setter);
-
-  v8::Isolate* isolate_;
-
-  // ObjectTemplateBuilder should only be used on the stack.
-  v8::Local<v8::ObjectTemplate> template_;
-};
-
-}  // namespace mate
-
-#endif  // NATIVE_MATE_NATIVE_MATE_OBJECT_TEMPLATE_BUILDER_DEPRECATED_H_

native_mate/native_mate/promise.cc

@@ -1,44 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "native_mate/promise.h"
-
-namespace mate {
-
-Promise::Promise() = default;
-
-Promise::Promise(v8::Isolate* isolate) : isolate_(isolate) {
-  resolver_ = v8::Promise::Resolver::New(isolate);
-}
-
-Promise::~Promise() = default;
-
-Promise Promise::Create(v8::Isolate* isolate) {
-  return Promise(isolate);
-}
-
-Promise Promise::Create() {
-  return Promise::Create(v8::Isolate::GetCurrent());
-}
-
-void Promise::RejectWithErrorMessage(const std::string& string) {
-  v8::Local<v8::String> error_message =
-      v8::String::NewFromUtf8(isolate(), string.c_str(),
-                              v8::NewStringType::kNormal,
-                              static_cast<int>(string.size()))
-          .ToLocalChecked();
-  v8::Local<v8::Value> error = v8::Exception::Error(error_message);
-  resolver_->Reject(mate::ConvertToV8(isolate(), error));
-}
-
-v8::Local<v8::Object> Promise::GetHandle() const {
-  return resolver_->GetPromise();
-}
-
-v8::Local<v8::Value> Converter<Promise>::ToV8(v8::Isolate* isolate,
-                                              Promise val) {
-  return val.GetHandle();
-}
-
-}  // namespace mate

native_mate/native_mate/promise.h

@@ -1,58 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef NATIVE_MATE_NATIVE_MATE_PROMISE_H_
-#define NATIVE_MATE_NATIVE_MATE_PROMISE_H_
-
-#include <string>
-
-#include "native_mate/converter.h"
-
-namespace mate {
-
-class Promise {
- public:
-  Promise();
-  explicit Promise(v8::Isolate* isolate);
-  virtual ~Promise();
-
-  static Promise Create(v8::Isolate* isolate);
-  static Promise Create();
-
-  v8::Isolate* isolate() const { return isolate_; }
-
-  virtual v8::Local<v8::Object> GetHandle() const;
-
-  template <typename T>
-  void Resolve(T* value) {
-    resolver_->Resolve(mate::ConvertToV8(isolate(), value));
-  }
-
-  template <typename T>
-  void Reject(T* value) {
-    resolver_->Reject(mate::ConvertToV8(isolate(), value));
-  }
-
-  void RejectWithErrorMessage(const std::string& error);
-
- protected:
-  v8::Isolate* isolate_ = nullptr;
-
- private:
-  v8::Local<v8::Promise::Resolver> resolver_;
-};
-
-template <>
-struct Converter<Promise> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, Promise val);
-  // TODO(MarshallOfSound): Implement FromV8 to allow promise chaining
-  //                        in native land
-  // static bool FromV8(v8::Isolate* isolate,
-  //                    v8::Local<v8::Value> val,
-  //                    Promise* out);
-};
-
-}  // namespace mate
-
-#endif  // NATIVE_MATE_NATIVE_MATE_PROMISE_H_

npm/install.js

@@ -8,22 +8,13 @@ const path = require('path')
 const extract = require('extract-zip')
 const { downloadArtifact } = require('@electron/get')
 
-let installedVersion = null
-try {
-  installedVersion = fs.readFileSync(path.join(__dirname, 'dist', 'version'), 'utf-8').replace(/^v/, '')
-} catch (ignored) {
-  // do nothing
-}
-
 if (process.env.ELECTRON_SKIP_BINARY_DOWNLOAD) {
   process.exit(0)
 }
 
 const platformPath = getPlatformPath()
 
-const electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist', platformPath)
-
-if (installedVersion === version && fs.existsSync(electronPath)) {
+if (isInstalled()) {
   process.exit(0)
 }
 
@@ -35,22 +26,44 @@ downloadArtifact({
   cacheRoot: process.env.electron_config_cache,
   platform: process.env.npm_config_platform || process.platform,
   arch: process.env.npm_config_arch || process.arch
-}).then((zipPath) => extractFile(zipPath)).catch((err) => onerror(err))
+}).then(extractFile).catch(err => {
+  console.error(err.stack)
+  process.exit(1)
+})
+
+function isInstalled () {
+  try {
+    if (fs.readFileSync(path.join(__dirname, 'dist', 'version'), 'utf-8').replace(/^v/, '') !== version) {
+      return false
+    }
+
+    if (fs.readFileSync(path.join(__dirname, 'path.txt'), 'utf-8') !== platformPath) {
+      return false
+    }
+  } catch (ignored) {
+    return false
+  }
+  
+  const electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist', platformPath)
+  
+  return fs.existsSync(electronPath)
+}
 
 // unzips and makes path.txt point at the correct executable
 function extractFile (zipPath) {
-  extract(zipPath, { dir: path.join(__dirname, 'dist') }, function (err) {
-    if (err) return onerror(err)
-    fs.writeFile(path.join(__dirname, 'path.txt'), platformPath, function (err) {
-      if (err) return onerror(err)
+  return new Promise((resolve, reject) => {
+    extract(zipPath, { dir: path.join(__dirname, 'dist') }, err => {
+      if (err) return reject(err)
+
+      fs.writeFile(path.join(__dirname, 'path.txt'), platformPath, err => {
+        if (err) return reject(err)
+
+        resolve()
+      })
     })
   })
 }
 
-function onerror (err) {
-  throw err
-}
-
 function getPlatformPath () {
   const platform = process.env.npm_config_platform || os.platform()
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "9.0.0-nightly.20191128",
+  "version": "9.0.0-nightly.20200109",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -130,6 +130,9 @@
       "python script/check-trailing-whitespace.py --fix",
       "git add filenames.auto.gni"
     ],
+    "{*.patch,.patches}": [
+      "node script/lint.js --patches --only --"
+    ],
     "DEPS": [
       "node script/gen-hunspell-filenames.js"
     ]

patches/boringssl/expose_aes-cfb.patch

@@ -3,6 +3,13 @@ From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Fri, 18 Jan 2019 14:23:28 -0800
 Subject: expose aes-{128,256}-cfb
 
+This exposes AES-CFB ciphers through the EVP APIs. BoringSSL has
+implementations for these ciphers, but Node doesn't realise that because
+without this patch, they're not listed in the APIs that Node uses.
+
+This should be upstreamed. See e.g.
+https://boringssl-review.googlesource.com/c/boringssl/+/33984 for a
+similar patch that was merged upstream.
 
 diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
 index b132265bc103658dba3de6e0c3dc50d3634da5b0..588a4773437c311877f275bf3679f9688cda3c46 100644

patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch

@@ -8,32 +8,8 @@ Refs https://github.com/nodejs/node/pull/26960.
 
 Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/38524.
 
-diff --git a/crypto/evp/p_rsa.c b/crypto/evp/p_rsa.c
-index 865b36af9b830302fb1068c4965133213c1507dc..71b342f13db5f446aa15f070b6e4aef9b8c25939 100644
---- a/crypto/evp/p_rsa.c
-+++ b/crypto/evp/p_rsa.c
-@@ -569,6 +569,19 @@ int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *out_padding) {
-                            0, out_padding);
- }
- 
-+int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md) {
-+  return 0;
-+}
-+
-+int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
-+  return 0;
-+}
-+
-+int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx,
-+                                            const EVP_MD *md) {
-+  return 0;
-+}
-+
- int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int salt_len) {
-   return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA,
-                            (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY),
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index ad9c05e052756715e3fe67bf9517863ede027d5b..d1729cfc8beefd2cb20abf05043fed43e566a312 100644
+index 19baa64ddba84c3dd59e65aef77d1ebbf49e43df..37217c49f7e05eb25562023bf356fdadae1bc66f 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
 @@ -723,6 +723,18 @@ OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int padding);

patches/breakpad/.patches

@@ -1 +0,0 @@
-build_win_iwyu_for_breakpad.patch

patches/breakpad/build_win_iwyu_for_breakpad.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Wed, 30 Oct 2019 18:21:45 -0700
-Subject: build,[win]: IWYU for //third_party/breakpad
-
-
-diff --git a/src/common/windows/guid_string.h b/src/common/windows/guid_string.h
-index 48a5c1d3708f9398fffbe5f5cda29b4ab2408e70..c3043bcb8817ae5be8682e22985bad2d7a498f43 100644
---- a/src/common/windows/guid_string.h
-+++ b/src/common/windows/guid_string.h
-@@ -34,6 +34,7 @@
- 
- #include <guiddef.h>
- 
-+#include <memory>
- #include <string>
- 
- namespace google_breakpad {
-diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
-index 5b7d1777538cd3cfefd0bef45558f900798d6c51..1f22cfc2d14b2523c7ae133c1ba6fe2d66333d47 100644
---- a/src/tools/windows/dump_syms/dump_syms.cc
-+++ b/src/tools/windows/dump_syms/dump_syms.cc
-@@ -33,6 +33,7 @@
- #include <stdio.h>
- #include <wchar.h>
- 
-+#include <memory>
- #include <string>
- 
- #include "common/windows/pdb_source_line_writer.h"

patches/chromium/.patches

@@ -15,7 +15,6 @@ web_contents.patch
 webview_cross_drag.patch
 disable_user_gesture_requirement_for_beforeunload_dialogs.patch
 gin_enable_disable_v8_platform.patch
-gin_with_namespace.patch
 blink-worker-enable-csp-in-file-scheme.patch
 disable-redraw-lock.patch
 v8_context_snapshot_generator.patch
@@ -37,7 +36,6 @@ chrome_key_systems.patch
 allow_nested_error_trackers.patch
 blink_initialization_order.patch
 ssl_security_state_tab_helper.patch
-exclude-a-few-test-files-from-build.patch
 desktop_media_list.patch
 proxy_config_monitor.patch
 gritsettings_resource_ids.patch
@@ -57,7 +55,6 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch
 unsandboxed_ppapi_processes_skip_zygote.patch
 patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
 build_add_electron_tracing_category.patch
-disable_custom_libcxx_on_windows.patch
 worker_context_will_destroy.patch
 fix_breakpad_symbol_generation_on_linux_arm.patch
 frame_host_manager.patch
@@ -74,17 +71,10 @@ expose_setuseragent_on_networkcontext.patch
 feat_add_set_theme_source_to_allow_apps_to.patch
 revert_cleanup_remove_menu_subtitles_sublabels.patch
 export_fetchapi_mojo_traits_to_fix_component_build.patch
-add_zoom_limit_setters_to_webcontents.patch
 revert_remove_contentrendererclient_shouldfork.patch
-build_win_disable_zc_twophase.patch
 ignore_rc_check.patch
-build_win_iwyu_for_smil_time.patch
 remove_usage_of_incognito_apis_in_the_spellchecker.patch
 chore_use_electron_resources_not_chrome_for_spellchecker.patch
-feat_unset_window_aspect_ratio_on_linux.patch
-fix_ambiguous_reference_to_data.patch
-backport_fix_msstl_compat_in_ui_events.patch
-build_win_fix_msstl_compatibility_for_pdf.patch
-fix_missing_algorithm_include.patch
 add_trustedauthclient_to_urlloaderfactory.patch
-fix_focusowningwebcontents_to_handle_renderwidgethosts_for_oopifs.patch
+feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
+accessible_pane_view.patch

patches/chromium/accessible_pane_view.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Thu, 4 Oct 2018 14:57:02 -0700
+Subject: fix: add back virtual methods in AccessiblePaneView
+
+Mark SetPaneFocus and RemovePaneFocus as virtual in AccessiblePaneView, as we
+need to override them in MenuBar.
+
+Pending upstream patch: https://crrev.com/c/1959189
+
+diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h
+index 813fd13860a863cd1e6e5bfec38d15f798418673..990c905e8f19dd015a625010ea30adfcb6f51ea6 100644
+--- a/ui/views/accessible_pane_view.h
++++ b/ui/views/accessible_pane_view.h
+@@ -35,7 +35,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
+   // If |initial_focus| is not NULL, that control will get
+   // the initial focus, if it's enabled and focusable. Returns true if
+   // the pane was able to receive focus.
+-  bool SetPaneFocus(View* initial_focus);
++  virtual bool SetPaneFocus(View* initial_focus);
+ 
+   bool pane_has_focus() const { return pane_has_focus_; }
+ 
+@@ -83,7 +83,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
+   bool ContainsForFocusSearch(View* root, const View* v);
+ 
+   // Remove pane focus.
+-  void RemovePaneFocus();
++  virtual void RemovePaneFocus();
+ 
+   View* GetFirstFocusableChild();
+   View* GetLastFocusableChild();

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3ad7ba77a 100644
+index 384f81bff1ae2551b180175a3ec88baf88677d12..166d2ef3e0d14a84ecbe3c5d0d0bd1c8329b3c9e 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -228,6 +228,10 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -258,6 +258,10 @@ int GpuMain(const MainFunctionParams& parameters) {
  
    logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
  
@@ -24,7 +24,7 @@ index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -336,7 +340,6 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -366,7 +370,6 @@ int GpuMain(const MainFunctionParams& parameters) {
    GpuProcess gpu_process(io_thread_priority);
  #endif
  
@@ -33,7 +33,7 @@ index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3
      client->PostIOThreadCreated(gpu_process.io_task_runner());
  
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index 3331f7152da864712e1878b4d2a2f5e2fa34b4ed..38b14405b42813d51406671ce0c4655a85bd88d0 100644
+index f68558bd2c4ff725443b0d6893ebe7da07c26a00..3dda58157f32dbc9c7d9001192c30a3a1c152437 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
 @@ -39,6 +39,10 @@ class CONTENT_EXPORT ContentGpuClient {
@@ -44,6 +44,6 @@ index 3331f7152da864712e1878b4d2a2f5e2fa34b4ed..38b14405b42813d51406671ce0c4655a
 +  // creating the message loop.
 +  virtual void PreCreateMessageLoop() {}
 +
-   // Initializes the registry. |registry| will be passed to a ConnectionFilter
-   // (which lives on the IO thread). Unlike other childthreads, the client must
-   // register additional interfaces on this registry rather than just creating
+   // Called during initialization once the GpuService has been initialized.
+   virtual void GpuServiceInitialized() {}
+ 

patches/chromium/add_realloc.patch

@@ -12,7 +12,7 @@ when we override ReallocateBufferMemory, so we therefore need to implement
 Realloc on the v8 side and correspondingly in gin.
 
 diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
-index a02797e94f61e8c71428633a4585a625dc5aadbd..305b7d307d233af699e3f495f85de0f8097ff311 100644
+index b94a71ef856f92404e16544e22ebbadf57cff363..b15685f6907bcafeb1acd62bfe76f0713dea27f3 100644
 --- a/gin/array_buffer.cc
 +++ b/gin/array_buffer.cc
 @@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 7fb51da7c03f9bd6bfcb8724710edf72dc81c79e..138a6fca7e85db767dea0e06be735fff81fe9c49 100644
+index c69cfebccd7d7bff35d2292e61bf6008f0ca7940..2cb5f5d3f89f2af13221e66b2277a28532d53deb 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -647,6 +647,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -654,6 +654,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
          size, ArrayBufferContents::kDontInitialize);
    }
  
@@ -54,7 +54,7 @@ index 7fb51da7c03f9bd6bfcb8724710edf72dc81c79e..138a6fca7e85db767dea0e06be735fff
      ArrayBufferContents::FreeMemory(data);
    }
 diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-index ac525b62a1282839bc906b1ee59837211a83476c..5e6c54b87e88ea2741bc7986bf76ddaa48723e56 100644
+index 095ca3db051362319611976b9052725ab16c1b3a..13e802a5732f0b04832d6dd8031ae43e1240b79a 100644
 --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
 +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
 @@ -126,6 +126,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@@ -70,14 +70,14 @@ index ac525b62a1282839bc906b1ee59837211a83476c..5e6c54b87e88ea2741bc7986bf76ddaa
    WTF::Partitions::ArrayBufferPartition()->Free(data);
  }
 diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-index 1adf4924657624059dcbe4e88cef684478787752..3b14d852b0654309cb53f933e396dc1e7b479790 100644
+index 2e871b20c1e6fc3703178957fd03923f02ab1b47..8f2fd80130f1e7f957d642af4e5c22f9a5937ce4 100644
 --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
 +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-@@ -149,6 +149,7 @@ class CORE_EXPORT ArrayBufferContents {
+@@ -106,6 +106,7 @@ class CORE_EXPORT ArrayBufferContents {
    void CopyTo(ArrayBufferContents& other);
  
    static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
 +  static void* Realloc(void* data, size_t);
    static void FreeMemory(void*);
-   static DataHandle CreateDataHandle(size_t, InitializationPolicy);
  
+  private:

patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

@@ -10,11 +10,11 @@ WebContents, and cancels the authentication if there's no WebContents
 available, which there isn't in the case of the 'net' module.
 
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 6b14d8354375377526e141ee499a7583be3f22b0..eeb9e19c0ecdf4631e596e7c0927693f2239f293 100644
+index def2cb5e252389879c6287d44d29e704703841cb..98d64785240bde3e182268e453dced41b432df9a 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -181,6 +181,25 @@ interface TrustedURLLoaderHeaderClient {
-       pending_receiver<TrustedHeaderClient> header_client);
+@@ -190,6 +190,25 @@ struct HttpAuthStaticNetworkContextParams {
+      = DefaultCredentials.ALLOW_DEFAULT_CREDENTIALS;
  };
  
 +interface TrustedAuthClient {
@@ -39,20 +39,20 @@ index 6b14d8354375377526e141ee499a7583be3f22b0..eeb9e19c0ecdf4631e596e7c0927693f
  interface CertVerifierClient {
    Verify(
      int32 default_error,
-@@ -559,6 +578,8 @@ struct URLLoaderFactoryParams {
-   // impact because of the extra process hops, so use should be minimized.
-   pending_remote<TrustedURLLoaderHeaderClient>? header_client;
+@@ -596,6 +615,8 @@ struct URLLoaderFactoryParams {
+   // interface. This still respects the per-context block lists.
+   CorsOriginAccessPatterns? factory_bound_access_patterns;
  
 +  pending_remote<TrustedURLLoaderAuthClient>? auth_client;
 +
-   // If non-empty array is given, |factory_bound_allow_patterns| is used for
-   // CORS checks in addition to the per-context allow patterns that is managed
-   // via NetworkContext interface. This still respects the per-context block
+   // Key used to isolate shared network resources like the cache.
+   NetworkIsolationKey? network_isolation_key;
+ 
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5bccd754a 100644
+index 96ea5f62e5796810f87abfb2a3c400ffcc024ff0..d50831adb6ba65ece49b62ec4a8cd1a92fdb0d28 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -335,6 +335,7 @@ URLLoader::URLLoader(
+@@ -334,6 +334,7 @@ URLLoader::URLLoader(
      base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
      base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
      mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
@@ -62,17 +62,17 @@ index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5
        network_service_client_(network_service_client),
 @@ -391,6 +392,11 @@ URLLoader::URLLoader(
      header_client_.set_disconnect_handler(
-         base::BindOnce(&URLLoader::OnConnectionError, base::Unretained(this)));
+         base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
    }
 +  if (url_loader_auth_client) {
 +    url_loader_auth_client->OnLoaderCreated(request_id_, auth_client_.BindNewPipeAndPassReceiver());
 +    auth_client_.set_disconnect_handler(
-+        base::BindOnce(&URLLoader::OnConnectionError, base::Unretained(this)));
++        base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
 +  }
    if (want_raw_headers_) {
      options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
                  mojom::kURLLoadOptionSendSSLInfoForCertificateError;
-@@ -818,7 +824,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
+@@ -826,7 +832,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
  
  void URLLoader::OnAuthRequired(net::URLRequest* url_request,
                                 const net::AuthChallengeInfo& auth_info) {
@@ -81,31 +81,34 @@ index d4e13ffaed76847b00cf98b248ba17ad70a9884c..33ab3ea9c60e097d8525f1066f3890a5
      OnAuthCredentials(base::nullopt);
      return;
    }
-@@ -834,10 +840,18 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
+@@ -842,11 +848,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
    if (url_request->response_headers())
-     head.headers = url_request->response_headers();
-   head.auth_challenge_info = auth_info;
+     head->headers = url_request->response_headers();
+   head->auth_challenge_info = auth_info;
 -  network_context_client_->OnAuthRequired(
 -      fetch_window_id_, factory_params_->process_id, render_frame_id_,
--      request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
+-      request_id_, url_request_->url(), first_auth_attempt_, auth_info,
+-      std::move(head),
 -      auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
 +
 +  if (auth_client_) {
 +    auth_client_->OnAuthRequired(
 +        fetch_window_id_, factory_params_->process_id, render_frame_id_,
-+        request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
++        request_id_, url_request_->url(), first_auth_attempt_, auth_info,
++        std::move(head),
 +        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
 +  } else {
 +    network_context_client_->OnAuthRequired(
 +        fetch_window_id_, factory_params_->process_id, render_frame_id_,
-+        request_id_, url_request_->url(), first_auth_attempt_, auth_info, head,
++        request_id_, url_request_->url(), first_auth_attempt_, auth_info,
++        std::move(head),
 +        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
 +  }
  
    auth_challenge_responder_receiver_.set_disconnect_handler(
        base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a755b93cc09 100644
+index 564851586d2ad5fe0ae6acd4457257ce8ed665b3..3291fe28deb20b9630589e8ea11ea1366583081c 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
 @@ -85,6 +85,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -116,7 +119,7 @@ index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a75
        mojom::OriginPolicyManager* origin_policy_manager);
    ~URLLoader() override;
  
-@@ -362,6 +363,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -378,6 +379,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    base::Optional<base::UnguessableToken> fetch_window_id_;
  
    mojo::Remote<mojom::TrustedHeaderClient> header_client_;
@@ -125,7 +128,7 @@ index 0a47148a52a46f8a6f12f503731623f87e15b173..db8ca018c7e99a1a1acea156b4d49a75
    std::unique_ptr<FileOpenerForUpload> file_opener_for_upload_;
  
 diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
-index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f897ac364f 100644
+index 9e9baaf8ecd33e6416027014361edc332ab71e3c..cc2c59828f56988d43b680588d4625d9864aa9b6 100644
 --- a/services/network/url_loader_factory.cc
 +++ b/services/network/url_loader_factory.cc
 @@ -65,6 +65,7 @@ URLLoaderFactory::URLLoaderFactory(
@@ -136,7 +139,7 @@ index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f8
        cors_url_loader_factory_(cors_url_loader_factory) {
    DCHECK(context);
    DCHECK_NE(mojom::kInvalidProcessId, params_->process_id);
-@@ -209,6 +210,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
+@@ -207,6 +208,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
        resource_scheduler_client_, std::move(keepalive_statistics_recorder),
        std::move(network_usage_accumulator),
        header_client_.is_bound() ? header_client_.get() : nullptr,
@@ -145,10 +148,10 @@ index 7145e0e96550d554bb1df85bd79818ec9a45f7b1..53225eb1b0b7f1aa2498cecc8222f9f8
    cors_url_loader_factory_->OnLoaderCreated(std::move(loader));
  }
 diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
-index 7b143aa49be833ddf05b7b99bea19ee0b674b79c..6d1fbca87e3827c953fdac2cfb96806114d8aea9 100644
+index 7d13494649c43be52b06774f2cf5763ebe9129c0..d4b19342c44f86c685f700e4260475ff2235b298 100644
 --- a/services/network/url_loader_factory.h
 +++ b/services/network/url_loader_factory.h
-@@ -71,6 +71,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
+@@ -72,6 +72,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
    mojom::URLLoaderFactoryParamsPtr params_;
    scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
    mojo::Remote<mojom::TrustedURLLoaderHeaderClient> header_client_;

patches/chromium/add_zoom_limit_setters_to_webcontents.patch

@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: John Kleinschmidt <kleinschmidtorama@gmail.com>
-Date: Mon, 23 Sep 2019 17:07:53 -0400
-Subject: add zoom limit setters to webcontents
-
-Allows minimum_zoom_percent_ and maximum_zoom_percent_ to be set on WebContents.
-This is needed by Electron to allow apps to limit how much an app can zoom in
-or out.
-
-diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c13511e26189e68376e29f38c4ae2e1cc8fd3c57..a5c4162b3c69b534f843e1b6737392c867fc88ea 100644
---- a/content/browser/web_contents/web_contents_impl.cc
-+++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4124,10 +4124,18 @@ bool WebContentsImpl::GetClosedByUserGesture() {
-   return closed_by_user_gesture_;
- }
- 
-+void WebContentsImpl::SetMinimumZoomPercent(int zoom_percent) {
-+  minimum_zoom_percent_ = zoom_percent;
-+}
-+
- int WebContentsImpl::GetMinimumZoomPercent() {
-   return minimum_zoom_percent_;
- }
- 
-+void WebContentsImpl::SetMaximumZoomPercent(int zoom_percent) {
-+  maximum_zoom_percent_ = zoom_percent;
-+}
-+
- int WebContentsImpl::GetMaximumZoomPercent() {
-   return maximum_zoom_percent_;
- }
-diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index ea1b3581ead984ac084fc9a2b9daf85f6756ea5c..b967e02b4052426855a2af88abbced2076b3e04a 100644
---- a/content/browser/web_contents/web_contents_impl.h
-+++ b/content/browser/web_contents/web_contents_impl.h
-@@ -447,7 +447,9 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
-   void SystemDragEnded(RenderWidgetHost* source_rwh) override;
-   void SetClosedByUserGesture(bool value) override;
-   bool GetClosedByUserGesture() override;
-+  void SetMinimumZoomPercent(int zoom_percent) override;
-   int GetMinimumZoomPercent() override;
-+  void SetMaximumZoomPercent(int zoom_percent) override;
-   int GetMaximumZoomPercent() override;
-   void SetPageScale(float page_scale_factor) override;
-   gfx::Size GetPreferredSize() override;
-@@ -1690,8 +1692,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
-   bool closed_by_user_gesture_;
- 
-   // Minimum/maximum zoom percent.
--  const int minimum_zoom_percent_;
--  const int maximum_zoom_percent_;
-+  int minimum_zoom_percent_;
-+  int maximum_zoom_percent_;
- 
-   // Used to correctly handle integer zooming through a smooth scroll device.
-   float zoom_scroll_remainder_;
-diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 750de66b8002ba66d0f2247d0075da1e51ac764c..1a57feeb1dfe08f8ce1113cb5d8c8ab57d761094 100644
---- a/content/public/browser/web_contents.h
-+++ b/content/public/browser/web_contents.h
-@@ -812,8 +812,10 @@ class WebContents : public PageNavigator,
-   virtual void SetClosedByUserGesture(bool value) = 0;
-   virtual bool GetClosedByUserGesture() = 0;
- 
--  // Gets the minimum/maximum zoom percent.
-+  // Gets/sets the minimum/maximum zoom percent.
-+  virtual void SetMinimumZoomPercent(int zoom_percent) = 0;
-   virtual int GetMinimumZoomPercent() = 0;
-+  virtual void SetMaximumZoomPercent(int zoom_percent) = 0;
-   virtual int GetMaximumZoomPercent() = 0;
- 
-   // Set the renderer's page scale to the given factor.

patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch

@@ -6,10 +6,10 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index 720b92a1a3a7ab5512f839005b272e4989d2ac65..b1759109627cd00053489dcdd397e942fa9d289f 100644
+index ea5258a03f83bcbda7bae296392a46cdd63d6fe1..14eed861e8828fd2ed7d8f27f9fd3bf180d04677 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
-@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
+@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
      const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
      options->fds_to_remap.push_back(
          std::make_pair(sandbox_fd, service_manager::GetSandboxFD()));

patches/chromium/backport_fix_msstl_compat_in_ui_events.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Thu, 31 Oct 2019 14:22:50 -0700
-Subject: backport: fix MSSTL compat in ui/events
-
-Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/1893754
-
-diff --git a/ui/events/blink/prediction/least_squares_predictor.cc b/ui/events/blink/prediction/least_squares_predictor.cc
-index b43fe1893134992937fc7d97ce335344683bfa6b..8a95e17d0835afebd7594c206438cb54022853c9 100644
---- a/ui/events/blink/prediction/least_squares_predictor.cc
-+++ b/ui/events/blink/prediction/least_squares_predictor.cc
-@@ -5,6 +5,8 @@
- #include "ui/events/blink/prediction/least_squares_predictor.h"
- #include "ui/events/blink/prediction/predictor_factory.h"
- 
-+#include <algorithm>
-+
- namespace ui {
- 
- namespace {
-diff --git a/ui/events/blink/prediction/linear_predictor.cc b/ui/events/blink/prediction/linear_predictor.cc
-index e97f579d80573a1f801986c724bb33cd8bc52e8a..190fa1b3894ef5f7828e2f265566e16ce10e84c5 100644
---- a/ui/events/blink/prediction/linear_predictor.cc
-+++ b/ui/events/blink/prediction/linear_predictor.cc
-@@ -5,6 +5,8 @@
- #include "ui/events/blink/prediction/linear_predictor.h"
- #include "ui/events/blink/prediction/predictor_factory.h"
- 
-+#include <algorithm>
-+
- namespace ui {
- 
- LinearPredictor::LinearPredictor(EquationOrder order) {
-diff --git a/ui/events/blink/prediction/linear_resampling.cc b/ui/events/blink/prediction/linear_resampling.cc
-index e2a8757b779ba270cd3ae8f1735543be3cc324e0..2b2efe7f132055dfc1f650707a9cbb7a5842ca1a 100644
---- a/ui/events/blink/prediction/linear_resampling.cc
-+++ b/ui/events/blink/prediction/linear_resampling.cc
-@@ -4,6 +4,8 @@
- 
- #include "ui/events/blink/prediction/linear_resampling.h"
- 
-+#include <algorithm>
-+
- #include "ui/events/blink/prediction/predictor_factory.h"
- 
- namespace ui {

patches/chromium/blink-worker-enable-csp-in-file-scheme.patch

@@ -3,9 +3,10 @@ From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 20 Sep 2018 17:47:47 -0700
 Subject: blink-worker-enable-csp-in-file-scheme.patch
 
+This allows file:// URLs in workers to have a CSP.
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index b1b9f451951bb7b11eefe6453a71a6b44be838a5..0f62ba09ef99538a5b0b306f601d10c44a7a7abf 100644
+index 1f8273a782a5d3580e139d724ce8a791a100dcfb..90ad0d663003c0bded47183b61bff71a0c01a196 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 @@ -308,7 +308,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(

patches/chromium/blink_file_path.patch

@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 05e05fb1631851009897f3789d3e770475ce1363..e2ad5fef884532847d035430c14c25e042e2ab24 100644
+index 7ea8ad8fd162fd6a97052188a8e8868dab1c1fe9..a64966e2db0e2e7b0390a322525522e05ddbb022 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
-@@ -201,6 +201,9 @@ class CORE_EXPORT File final : public Blob {
+@@ -193,6 +193,9 @@ class CORE_EXPORT File final : public Blob {
    }
    const String& name() const { return name_; }
  
@@ -21,7 +21,7 @@ index 05e05fb1631851009897f3789d3e770475ce1363..e2ad5fef884532847d035430c14c25e0
    // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
    int64_t lastModified() const;
 diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
-index 41b8183e858b6d955bacbb72281a08e750b6b29f..0db894ecfae63795724335d914f9f992c0755fd1 100644
+index e5cf6cc926ff2670f713018dd750e79c53ee76eb..60eca3cf100b31c3d2c0c68271d98c60321e69a7 100644
 --- a/third_party/blink/renderer/core/fileapi/file.idl
 +++ b/third_party/blink/renderer/core/fileapi/file.idl
 @@ -32,6 +32,7 @@

patches/chromium/blink_initialization_order.patch

@@ -10,10 +10,10 @@ to fix electron/electron#13787.  The backport landed in Chromium 67 but the
 DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index 4eb7d11483b55ef99758aa6782b3516fef706628..c384a9707d0f998b5e8bc80ad9af1ca29d9ef58c 100644
+index 8095edd988c171a8ad7382d1c2f9fa63ee9e5ffc..802316843c6c270efb871a5d697c4e0d182605d0 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -210,11 +210,10 @@ void LocalWindowProxy::Initialize() {
+@@ -227,11 +227,10 @@ void LocalWindowProxy::Initialize() {
                   GetFrame()->IsMainFrame());
      MainThreadDebugger::Instance()->ContextCreated(script_state_, GetFrame(),
                                                     origin);

patches/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index fa4e26718e2d663305a2be664d8ffbf1a64b3c34..7ba237076e14f0806b94a2fcae3894fec31d0e71 100644
+index 94019ebf806be6b0a9424b43579d46bf6a0e3de4..fa827b5846fc93c59f98795da51bab0f3b33de5e 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -333,10 +333,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -344,10 +344,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    CHECK(!view_ || !view_->IsAttached());
  
@@ -28,7 +28,7 @@ index fa4e26718e2d663305a2be664d8ffbf1a64b3c34..7ba237076e14f0806b94a2fcae3894fe
    if (!Client())
      return;
  
-@@ -354,6 +350,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -365,6 +361,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
    GetScriptController().ClearForClose();

patches/chromium/blink_world_context.patch

@@ -3,12 +3,14 @@ From: Anonymous <anonymous@electronjs.org>
 Date: Thu, 20 Sep 2018 17:45:11 -0700
 Subject: blink_world_context.patch
 
+This exposes a method for obtaining a reference to an isolated world, which is
+otherwise not available in the Blink API.
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index fd5d927dda08bb8ea9fe89ae752d700c67ca1bbe..81a452bf2d2e61cbff0c4573223b0af5a5e20083 100644
+index 05a33b9a2cbed57e4e037428397b59f30f83ce66..0cd308b38a158a016b099beed6a31fa1c5a487ad 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -343,6 +343,9 @@ class WebLocalFrame : public WebFrame {
+@@ -341,6 +341,9 @@ class WebLocalFrame : public WebFrame {
    // be calling this API.
    virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
  
@@ -19,10 +21,10 @@ index fd5d927dda08bb8ea9fe89ae752d700c67ca1bbe..81a452bf2d2e61cbff0c4573223b0af5
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 81c8e59d81af696b6175f3cf6ce5441d8ae9c265..dd77b47e884a703590a3ad74513f189621ca89e6 100644
+index 8c984ae92de2a53e59782bea94a143ee7fde2248..105e1e92002adde207db5c770197547ab6b55f97 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -880,6 +880,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -935,6 +935,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
  
@@ -37,10 +39,10 @@ index 81c8e59d81af696b6175f3cf6ce5441d8ae9c265..dd77b47e884a703590a3ad74513f1896
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index 16e0460b1c4d7e239e0516a52a3f375c016f37b8..1d5f93c1a79a68815273191ae89f8b995ed97256 100644
+index e3d4a369e6708827497b7ef8ce38817bde8c8010..ad7fd6c34f10d10257ef5c6e5b4b916dc924f20c 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -170,6 +170,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -171,6 +171,8 @@ class CORE_EXPORT WebLocalFrameImpl final
        int argc,
        v8::Local<v8::Value> argv[]) override;
    v8::Local<v8::Context> MainWorldScriptContext() const override;

patches/chromium/build_add_electron_tracing_category.patch

@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 14fd70d103a707a4aa217f662037908178daf9cf..30011a1bda4ba3c11aa1811649730e781ccb5cbf 100644
+index 095c6255cfe830049137e42ecc4668d1bf877f33..87abc44f392e47a7655c127edf27f4d5ff419bb0 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -66,6 +66,7 @@

patches/chromium/build_gn.patch

@@ -3,6 +3,15 @@ From: Ales Pergl <alpergl@microsoft.com>
 Date: Thu, 20 Sep 2018 17:44:29 -0700
 Subject: build_gn.patch
 
+These are variables we add to the root BUILDCONFIG so that they're available
+everywhere, without having to import("//electron/.../flags.gni").
+
+Additionally, we add the `:mas_build` config to every compiled file so that
+the `MAS_BUILD` #define is available everywhere. This produces fewer patch
+conflicts when upgrading than it would if we added a specific config dependency
+only to those targets which had MAS_BUILD-relevant content in them. The
+tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will
+rebuild the entire tree.
 
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 index f89e7e831b79f82bd11a5dd8cee6ab49d8de724e..f8a611bf0676ce323cdbb5d639333df9875dd0ca 100644

patches/chromium/build_win_disable_zc_twophase.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Tue, 16 Jul 2019 14:38:52 -0700
-Subject: build_win_disable_zc_twophase.patch
-
-Temporarily disable /Zc:twoPhase when libcxx is not used on
-Windows. This is to workaround the bug in crbug.com/969698#c10
-until fixes have landed in upstream.
-
-diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
-index 95e32520781fc225be1c2bf7d8bfe43925d16d45..8de0cb6a8d1987f84aaca5c3bb30ead0a2019bef 100644
---- a/build/config/win/BUILD.gn
-+++ b/build/config/win/BUILD.gn
-@@ -2,6 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import("//build/config/c++/c++.gni")
- import("//build/config/chrome_build.gni")
- import("//build/config/clang/clang.gni")
- import("//build/config/compiler/compiler.gni")
-@@ -63,7 +64,8 @@ config("compiler") {
-     "/utf-8",  # Assume UTF-8 by default to avoid code page dependencies.
-   ]
- 
--  if (is_clang) {
-+  if (use_custom_libcxx) {
-+    # Work around crbug.com/969698#c6, bug in MSSTL <xxatomic>.
-     cflags += [ "/Zc:twoPhase" ]
-   }
- 

patches/chromium/build_win_fix_msstl_compatibility_for_pdf.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Deepak Mohan <hop2deep@gmail.com>
-Date: Fri, 1 Nov 2019 15:13:55 -0700
-Subject: build,[win]: fix msstl compatibility for //pdf
-
-
-diff --git a/pdf/document_layout.cc b/pdf/document_layout.cc
-index 51064a3496f8d9354d00db6085cc9c5d23f7ec0c..b53da54e153b2078a2e18c9af38cfbbbae8da5b8 100644
---- a/pdf/document_layout.cc
-+++ b/pdf/document_layout.cc
-@@ -4,6 +4,8 @@
- 
- #include "pdf/document_layout.h"
- 
-+#include <algorithm>
-+
- #include "base/logging.h"
- #include "ppapi/cpp/rect.h"
- #include "ppapi/cpp/size.h"
-diff --git a/pdf/draw_utils/coordinates.cc b/pdf/draw_utils/coordinates.cc
-index 49c272f269ce312a72921506bd0abeeea283050f..11b7cca86116940810da374dd64ec437986ccccc 100644
---- a/pdf/draw_utils/coordinates.cc
-+++ b/pdf/draw_utils/coordinates.cc
-@@ -4,6 +4,7 @@
- 
- #include "pdf/draw_utils/coordinates.h"
- 
-+#include <algorithm>
- #include <math.h>
- 
- #include "base/logging.h"

patches/chromium/build_win_iwyu_for_smil_time.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Wed, 30 Oct 2019 12:23:00 -0700
-Subject: build,[win]: IWYU for //third_party/blink/renderer/core/svg/animation
-
-Only affects windows release builds, identify the cause and remove this patch.
-
-diff --git a/third_party/blink/renderer/core/svg/animation/smil_time.h b/third_party/blink/renderer/core/svg/animation/smil_time.h
-index b4fec36d9ef15c5492ce6bbe544c11bdfc01ec10..7433a3a1c8578dbeb388628f1050629133c94f83 100644
---- a/third_party/blink/renderer/core/svg/animation/smil_time.h
-+++ b/third_party/blink/renderer/core/svg/animation/smil_time.h
-@@ -26,6 +26,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SVG_ANIMATION_SMIL_TIME_H_
- #define THIRD_PARTY_BLINK_RENDERER_CORE_SVG_ANIMATION_SMIL_TIME_H_
- 
-+#include <algorithm>
- #include <ostream>
- 
- #include "base/time/time.h"

patches/chromium/can_create_window.patch

@@ -3,12 +3,16 @@ From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:32 -0700
 Subject: can_create_window.patch
 
+This adds a hook to the window creation flow so that Electron can intercede and
+potentially prevent a window from being created.
+
+TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 6dc225ede0a64d77c103b80fc76d51299170cc44..0f89422b5c73c608df289834587ec98376079ee2 100644
+index b7ed7e9f59b7cde06aa468e1fec708c791327a57..14b3d4603b8143ea2660c0fad5ab8e8547f2854a 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -4307,6 +4307,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4397,6 +4397,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,
@@ -17,10 +21,10 @@ index 6dc225ede0a64d77c103b80fc76d51299170cc44..0f89422b5c73c608df289834587ec983
            &no_javascript_access);
  
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 23aa37d474df2b52f91d6d07a3423728f2f6e776..4583407a4a287c9fe39e013fee3a0e3a1cf9fe12 100644
+index 46d534b72813c8fb6dfa2ad42f2d81b983cfdf90..9c492e3c2ebd4f6e89ee883d08522145594a8e01 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -296,6 +296,10 @@ struct CreateNewWindowParams {
+@@ -302,6 +302,10 @@ struct CreateNewWindowParams {
  
    // The window features to use for the new window.
    blink.mojom.WindowFeatures features;
@@ -32,10 +36,10 @@ index 23aa37d474df2b52f91d6d07a3423728f2f6e776..4583407a4a287c9fe39e013fee3a0e3a
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index ee168f4c2dd6d3c81563baaa7476e80bb2aa7b95..3fdc443b408c3d8f7ffdabf6b010d5fc1ecd22d5 100644
+index 602008278edca8b34ba02e5c5d236ab9342b3cc0..76261e6b09094527327e068e183d3d3b2665467b 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -506,6 +506,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -510,6 +510,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -45,10 +49,10 @@ index ee168f4c2dd6d3c81563baaa7476e80bb2aa7b95..3fdc443b408c3d8f7ffdabf6b010d5fc
      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 3792cba399a4b80f9fbb7fa1c5561f4614dbba62..891b69d65de0e47719af23eb7047d22d10417019 100644
+index c2af7b3b2b38997b083bc860e4abca63a53d73e4..2196584c127c8a3f80bfe55aaff3187372c19b1e 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -134,6 +134,7 @@ class NetworkService;
+@@ -135,6 +135,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -56,7 +60,7 @@ index 3792cba399a4b80f9fbb7fa1c5561f4614dbba62..891b69d65de0e47719af23eb7047d22d
  }  // namespace network
  
  namespace rappor {
-@@ -812,6 +813,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -823,6 +824,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -66,18 +70,18 @@ index 3792cba399a4b80f9fbb7fa1c5561f4614dbba62..891b69d65de0e47719af23eb7047d22d
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 2ddadfe3aa8aa8be885001429c5e817063788199..08ef43b9dcd13ee48598dd50b893347635ab6b06 100644
+index 2c43fe2096f9c76b6ca757dcd2d53eb596bca2c1..f815739a06a60e050003d2819ddab82be2abf3a6 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -71,6 +71,7 @@
+@@ -70,6 +70,7 @@
  #include "content/renderer/ime_event_guard.h"
  #include "content/renderer/internal_document_state_data.h"
  #include "content/renderer/loader/request_extra_data.h"
 +#include "content/renderer/loader/web_url_request_util.h"
  #include "content/renderer/media/audio/audio_device_factory.h"
- #include "content/renderer/media/webrtc/rtc_peer_connection_handler.h"
  #include "content/renderer/render_frame_impl.h"
-@@ -1341,6 +1342,8 @@ WebView* RenderViewImpl::CreateView(
+ #include "content/renderer/render_frame_proxy.h"
+@@ -1333,6 +1334,8 @@ WebView* RenderViewImpl::CreateView(
    }
    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
  
@@ -87,10 +91,10 @@ index 2ddadfe3aa8aa8be885001429c5e817063788199..08ef43b9dcd13ee48598dd50b8933476
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index 87667cbeca11db24199ece95c717dd6a42f7466c..5f5af14a08f70d9e6de4454d6f672699c3e85c8f 100644
+index 5908c91e81f94575ec772fa86833fe1effe07c99..ac05f23929d1223646d6bc1956a581c48ee1f844 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -315,6 +315,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -331,6 +331,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -100,10 +104,10 @@ index 87667cbeca11db24199ece95c717dd6a42f7466c..5f5af14a08f70d9e6de4454d6f672699
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
-index 987f2228a312a3cb9c9a04dd682987d1af3f3fe0..30cde8a73a4ca67edd8f898ff63cf446f62bfc64 100644
+index 63252a3503176be335510c0bbeaed2a39929930d..45fab07bdc9d11df755cb172f7314e6f131f31df 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.h
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.h
-@@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
+@@ -69,6 +69,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
                         const std::string& frame_name,
                         WindowOpenDisposition disposition,
                         const blink::mojom::WindowFeatures& features,

patches/chromium/command-ismediakey.patch

@@ -3,48 +3,22 @@ From: Jeremy Apthorp <jeremya@chromium.org>
 Date: Wed, 10 Oct 2018 15:07:34 -0700
 Subject: command-ismediakey.patch
 
-define Command::IsMediaKey on mac; copied from //chrome/common/extensions/command.cc,
-which also defines a bunch of other stuff that depends on extensions.
-since we only need IsMediaKey, and we don't want the extensions stuff
-(and aren't compiling command.cc), it's safe to duplicate the
-definition. A candidate for upstreaming would be to move the IsMediaKey
-function into //ui.
+Override MediaKeysListener::IsMediaKeycode to also listen for Volume Up, Volume Down,
+and Mute. We also need to patch out Chromium's usage of RemoteCommandCenterDelegate, as
+it uses MPRemoteCommandCenter. MPRemoteCommandCenter makes it such that GlobalShortcuts
+in Electron will not work as intended, because by design an app does not receive remote
+control events until it begins playing audio. This means that a media shortcut would not kick
+into effect until you, for example, began playing a YouTube video which sort of defeats the
+purpose of GlobalShortcuts.
+
+At the moment there is no upstream possibility for this; but perhaps Chromium may
+consider some kind of switch, enabled by default, which would conditionally choose to avoid usage of
+RemoteCommandCenterDelegate on macOS.
 
 Also apply electron/electron@0f67b1866a9f00b852370e721affa4efda623f3a
 and electron/electron@d2368d2d3b3de9eec4cc32b6aaf035cc89921bf1 as
 patches.
 
-diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/browser/extensions/global_shortcut_listener_mac.mm
-index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e5195bfdf0e1 100644
---- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
-+++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
-@@ -21,6 +21,26 @@
- 
- namespace extensions {
- 
-+// NOTE: this is defined in command.cc, but command.cc is full of
-+// chrome-extensions-specific logic that we don't want to depend on.
-+// Since we don't build command.cc in Electron, it's safe to re-define this
-+// function here. Ideally, though, `IsMediaKey` would be the responsibility of
-+// `ui::Accelerator`, rather than `extensions::Command`.
-+
-+// static
-+bool Command::IsMediaKey(const ui::Accelerator& accelerator) {
-+  if (accelerator.modifiers() != 0)
-+    return false;
-+
-+  return (accelerator.key_code() == ui::VKEY_MEDIA_NEXT_TRACK ||
-+          accelerator.key_code() == ui::VKEY_MEDIA_PREV_TRACK ||
-+          accelerator.key_code() == ui::VKEY_MEDIA_PLAY_PAUSE ||
-+          accelerator.key_code() == ui::VKEY_MEDIA_STOP ||
-+          accelerator.key_code() == ui::VKEY_VOLUME_UP ||
-+          accelerator.key_code() == ui::VKEY_VOLUME_DOWN ||
-+          accelerator.key_code() == ui::VKEY_VOLUME_MUTE);
-+}
-+
- // static
- GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
-   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
 index c5125495b4d178ffb18be4d2d9670f7556412cbd..cddb321abb938c667a4a2089f87eab999510e9b1 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -87,11 +61,33 @@ index 392cf3d58c64c088596e8d321a2ce37b0ec60b6e..43e30f47240dc10a3a9b950255d4e487
  
    ui::Accelerator accelerator(
        ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
+diff --git a/ui/base/accelerators/media_keys_listener.cc b/ui/base/accelerators/media_keys_listener.cc
+index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc7951d372 100644
+--- a/ui/base/accelerators/media_keys_listener.cc
++++ b/ui/base/accelerators/media_keys_listener.cc
+@@ -13,7 +13,8 @@ MediaKeysListener::~MediaKeysListener() = default;
+ // static
+ bool MediaKeysListener::IsMediaKeycode(KeyboardCode key_code) {
+   return key_code == VKEY_MEDIA_PLAY_PAUSE || key_code == VKEY_MEDIA_STOP ||
+-         key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK;
++         key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK ||
++         key_code == VKEY_VOLUME_UP || key_code == VKEY_VOLUME_DOWN || key_code == VKEY_VOLUME_MUTE;
+ }
+ 
+ }  // namespace ui
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index f4e3126a4efd66f05c4f13e40ba23db10b8cca96..bb4c1a891dd13855227b39a0e582fd4dbc342ec9 100644
+index 85378bb565de617b1bd611d28c8714361747a357..94a899e76586d2c7bb199828bfa4aa1ef9ccfcbc 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
-@@ -33,6 +33,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
+@@ -11,6 +11,7 @@
+ #include <IOKit/hidsystem/ev_keymap.h>
+ 
+ #include "base/containers/flat_set.h"
++#include "electron/buildflags/buildflags.h"
+ #include "ui/base/accelerators/accelerator.h"
+ #include "ui/base/accelerators/system_media_controls_media_keys_listener.h"
+ 
+@@ -32,6 +33,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
      case NX_KEYTYPE_NEXT:
      case NX_KEYTYPE_FAST:
        return VKEY_MEDIA_NEXT_TRACK;
@@ -104,7 +100,7 @@ index f4e3126a4efd66f05c4f13e40ba23db10b8cca96..bb4c1a891dd13855227b39a0e582fd4d
    }
    return VKEY_UNKNOWN;
  }
-@@ -193,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
+@@ -192,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
    int key_code = (data1 & 0xFFFF0000) >> 16;
    if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
        key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&
@@ -116,3 +112,18 @@ index f4e3126a4efd66f05c4f13e40ba23db10b8cca96..bb4c1a891dd13855227b39a0e582fd4d
      return event;
    }
  
+@@ -223,12 +233,14 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
+   // For Mac OS 10.12.2 or later, we want to use MPRemoteCommandCenter for
+   // getting media keys globally if there is a RemoteCommandCenterDelegate
+   // available.
++#if !BUILDFLAG(ENABLE_MEDIA_KEY_OVERRIDES)
+   if (scope == Scope::kGlobal) {
+     auto listener =
+         std::make_unique<SystemMediaControlsMediaKeysListener>(delegate);
+     if (listener->Initialize())
+       return listener;
+   }
++#endif
+ 
+   return std::make_unique<MediaKeysListenerImpl>(delegate, scope);
+ }

patches/chromium/content_browser_main_loop.patch

@@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
 in atom::CommonWebContentsDelegate::ResetManageWebContents.
 
 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index 3af6a64be2f12cc4b7618f2c4db1a70fe7df0689..a81a8a3ba12b75fffd871b63bfc5c0564ea87826 100644
+index c7011af100a71b1ea90bc5d059bf1cc65f43f556..84e5ed786ac73497102ce82870e71ab085c626b4 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1541,7 +1541,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1483,7 +1483,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
    NOTREACHED();
  #else
    base::RunLoop run_loop;

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/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-index 6d52381b3cb1aa290d33ae07c6e4c499e007b928..60e8705fb3afe5e7712a159d79fee2efa4bd3587 100644
+index aacac1dc1e6c70e63dce08e81327db9fbabb5148..49ac1945ccb523dff61caf5b88a2bbc906b6fd09 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
-@@ -1226,8 +1226,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
+@@ -1250,8 +1250,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
      return NAVIGATION_TYPE_NEW_SUBFRAME;
    }
  
@@ -33,7 +33,7 @@ index 6d52381b3cb1aa290d33ae07c6e4c499e007b928..60e8705fb3afe5e7712a159d79fee2ef
  
    if (rfh->GetParent()) {
      // All manual subframes would be did_create_new_entry and handled above, so
-@@ -1483,7 +1485,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
+@@ -1507,7 +1509,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
      new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
    }
  

patches/chromium/desktop_media_list.patch

@@ -29,7 +29,7 @@ index a489bf6ea2179059f53e53563e993db9c7cd123b..93e237569fe94ec8526f67d915e1a735
    virtual content::DesktopMediaID::Type GetMediaListType() const = 0;
  };
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-index 9d9b7435044c4b84f971bd94765eb875fbac1624..2918f91d8e1308bf5a47313e20ad3cec74918f3a 100644
+index ba64a40697c7bb91d6e944ad9ea8fa50dd970633..d2600791197082c8c2e179ee4df66965234c4542 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
 @@ -22,6 +22,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period)
@@ -111,7 +111,7 @@ index ad7f766a36b1b6b2a8bc0f96369f1aaadf6681f7..f6c6c14a0937430df62c9b9c1132c591
   protected:
    virtual ~DesktopMediaListObserver() {}
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 2b109bd1dea2aed647ec01c0660b2d4c963312f2..8567b4c84b55f1f7774ef3755dca63e94ddd7a29 100644
+index d415675b3f7b757f2fb7a972e1bd96032f9ddd2c..b143433c995319e35216f359c1b57331917b1271 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
 @@ -10,14 +10,15 @@
@@ -131,7 +131,7 @@ index 2b109bd1dea2aed647ec01c0660b2d4c963312f2..8567b4c84b55f1f7774ef3755dca63e9
  #include "media/base/video_util.h"
  #include "third_party/libyuv/include/libyuv/scale_argb.h"
  #include "third_party/skia/include/core/SkBitmap.h"
-@@ -220,6 +221,8 @@ void NativeDesktopMediaList::Worker::RefreshThumbnails(
+@@ -221,6 +222,8 @@ void NativeDesktopMediaList::Worker::RefreshThumbnails(
        FROM_HERE, {BrowserThread::UI},
        base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                       media_list_));

patches/chromium/disable-redraw-lock.patch

@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 00971fc552171adb0ee9d4227a0bd03dfe1306be..10748277ed62c1e60bb95cfd9e8ddfe06dea4066 100644
+index 08807dc1a6cabea84277de128a92bc8de2bbee63..1fd8da727592fec91056021ea9616996a8f54b92 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -305,6 +305,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index 00971fc552171adb0ee9d4227a0bd03dfe1306be..10748277ed62c1e60bb95cfd9e8ddfe0
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -976,6 +981,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -975,6 +980,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
@@ -49,7 +49,7 @@ index 00971fc552171adb0ee9d4227a0bd03dfe1306be..10748277ed62c1e60bb95cfd9e8ddfe0
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 8299c29aa1cff21c9ce66bb0a1934149f4be5d12..504bad57987009ec8c87641a52eb28d98e2d5c06 100644
+index 84dae56aad5bed31caf4e885cc919473f73decd2..4d094132f2c7f7f32328b27406cde8215dc56829 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -202,6 +202,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,

patches/chromium/disable_color_correct_rendering.patch

@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 855b96ae0c398506ec81bd24c0430f2573706d80..977c07db32933a9cc04b1f0613014718d4725640 100644
+index eec90ffd526a1fce7dc05bcd47764ae2f9a34796..559503c10d4887209dfd31535c714f176bd5bf45 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1822,6 +1822,12 @@ const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpace() const {
+@@ -1816,6 +1816,12 @@ const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpace() const {
  
  const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpaceAndId(
      int* id) const {
@@ -37,10 +37,10 @@ index 855b96ae0c398506ec81bd24c0430f2573706d80..977c07db32933a9cc04b1f0613014718
    // The pending tree will have the most recently updated color space, so
    // prefer that.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 182eb5f68731afdaba5ce71d0fa67ea1051eb0dc..3dd350583c3f23445841c3e46122ae6e809508b2 100644
+index 0743417d59c41ce2b4ba89f89f7f03db3849fc74..65f3ab8f48477908ed605f9c73d9d21f1a3709c3 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
-@@ -96,6 +96,8 @@ class CC_EXPORT LayerTreeSettings {
+@@ -100,6 +100,8 @@ class CC_EXPORT LayerTreeSettings {
    bool use_rgba_4444 = false;
    bool unpremultiply_and_dither_low_bit_depth_tiles = false;
  
@@ -62,7 +62,7 @@ index 389f2ed29bd85c35b38df92346a8d6c76ce22fd6..02cf492fa4068d10c4b8b2addee8102b
    bool force_antialiasing = false;
    bool force_blending_with_shaders = false;
 diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
-index f17aa1fa451f1b99d7f083e07edd49b11f7639e4..09f7c5d6a92d89c199b296771a8ff60c89a07083 100644
+index cb69e08c0185f55497089505ed5b226e57140321..362f28accc248248f3bcb54955c2352819242fa9 100644
 --- a/components/viz/host/renderer_settings_creation.cc
 +++ b/components/viz/host/renderer_settings_creation.cc
 @@ -13,6 +13,7 @@
@@ -83,7 +83,7 @@ index f17aa1fa451f1b99d7f083e07edd49b11f7639e4..09f7c5d6a92d89c199b296771a8ff60c
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  #if defined(OS_MACOSX)
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae75e5a0abe 100644
+index 30533e787515416723ec41095119871a02fa7805..2682fb11f2c0049c3f3be9a34a2b319bc1a6ff15 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -83,6 +83,9 @@
@@ -157,10 +157,10 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
    gfx::ColorSpace dst_color_space =
 -      current_frame()->current_render_pass->color_space;
 +      PATCH_CS(current_frame()->current_render_pass->color_space);
+ 
+ #if defined(OS_WIN)
    // Force sRGB output on Windows for overlay candidate video quads to match
-   // DirectComposition behavior in case these switch between overlays and
-   // compositing. See https://crbug.com/811118 for details.
-@@ -2460,8 +2465,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
+@@ -2463,8 +2468,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
  
    SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
                                          ShouldApplyRoundedCorner(quad)),
@@ -171,7 +171,7 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
  
    DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
    gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2523,8 +2528,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
+@@ -2526,8 +2531,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
        draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
  
    // Bind the program to the GL state.
@@ -182,7 +182,7 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
  
    if (current_program_->rounded_corner_rect_location() != -1) {
      SetShaderRoundedCorner(
-@@ -3233,7 +3238,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
+@@ -3239,7 +3244,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
  void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
                                 const gfx::ColorSpace& src_color_space,
                                 const gfx::ColorSpace& dst_color_space) {
@@ -193,7 +193,7 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
  
    gfx::ColorSpace adjusted_color_space = src_color_space;
    float sdr_white_level = current_frame()->sdr_white_level;
-@@ -3612,7 +3619,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -3634,7 +3641,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
  
    *overlay_texture = FindOrCreateOverlayTexture(
        params.quad->render_pass_id, iosurface_width, iosurface_height,
@@ -202,7 +202,7 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
    *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                             gfx::SizeF((*overlay_texture)->texture.size()));
  
-@@ -3830,8 +3837,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -3853,8 +3860,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
  
    PrepareGeometry(SHARED_BINDING);
  
@@ -213,17 +213,17 @@ index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae7
  
    gfx::Transform render_matrix;
    render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -3991,3 +3998,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
+@@ -4014,3 +4021,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
  }
  
  }  // namespace viz
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 6deb2a50ff258ce3b1f892abccd6be2f9cf4e255..ab723f93e259453689ece2b2f447cbed1854e4c1 100644
+index afda4382cde0e00a8ed19983b498c57bdf3a1cfe..347165e1806425c6bd6fe9573834fa7fb42ccafa 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -186,6 +186,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -193,6 +193,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
  
  // Command-line switches to propagate to the GPU process.
  static const char* const kSwitchNames[] = {
@@ -232,10 +232,10 @@ index 6deb2a50ff258ce3b1f892abccd6be2f9cf4e255..ab723f93e259453689ece2b2f447cbed
      service_manager::switches::kGpuSandboxAllowSysVShm,
      service_manager::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 71e6b162a8e56e63731b61c171c20d134e7e8b47..ea6722ee4162bdc1e0d8f7548bc971d268d343c4 100644
+index 89a77a7c263eccbf4d6dd29bbfd7924647bd5f2e..db1201218322a3bb3955aeea6f1f2e74abc9b898 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -226,6 +226,7 @@
+@@ -228,6 +228,7 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/base/ui_base_switches_util.h"
  #include "ui/display/display_switches.h"
@@ -243,7 +243,7 @@ index 71e6b162a8e56e63731b61c171c20d134e7e8b47..ea6722ee4162bdc1e0d8f7548bc971d2
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  #include "url/origin.h"
-@@ -3039,6 +3040,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -2988,6 +2989,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -252,10 +252,10 @@ index 71e6b162a8e56e63731b61c171c20d134e7e8b47..ea6722ee4162bdc1e0d8f7548bc971d2
      service_manager::switches::kDisableInProcessStackTraces,
      service_manager::switches::kDisableSeccompFilterSandbox,
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
-index 84af6512284655c8781fd839fc50cd3a75395889..d51198f40580d023d2bfcb6a131b7e5a0e2d4769 100644
+index 60fc1899350549866b1084175f8f7f31ee56e38b..120236bc3b0eadd1c5cfd51517309a4c603eb1c5 100644
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
-@@ -2976,6 +2976,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
+@@ -2938,6 +2938,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  
@@ -266,7 +266,7 @@ index 84af6512284655c8781fd839fc50cd3a75395889..d51198f40580d023d2bfcb6a131b7e5a
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 1aedba288aed698fd1b7ac6a4ef1a67fc892f84a..0113b09e2f2bb85b4ec43a90503b9ed98e42fd0f 100644
+index a947db5fb562fb4ccbfb94df88f460f1da9451f4..77c816b2c5e98a4546c74d9358dfcf3f205f1781 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 @@ -4,6 +4,7 @@
@@ -285,7 +285,7 @@ index 1aedba288aed698fd1b7ac6a4ef1a67fc892f84a..0113b09e2f2bb85b4ec43a90503b9ed9
  
  namespace blink {
  
-@@ -89,6 +91,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
+@@ -85,6 +87,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
  }
  
  gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
@@ -297,7 +297,7 @@ index 1aedba288aed698fd1b7ac6a4ef1a67fc892f84a..0113b09e2f2bb85b4ec43a90503b9ed9
    gfx::ColorSpace::PrimaryID primary_id = GetPrimaryID(color_space_);
  
    // TODO(ccameron): This needs to take into account whether or not this texture
-@@ -102,6 +109,11 @@ gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
+@@ -98,6 +105,11 @@ gfx::ColorSpace CanvasColorParams::GetSamplerGfxColorSpace() const {
  }
  
  gfx::ColorSpace CanvasColorParams::GetStorageGfxColorSpace() const {

patches/chromium/disable_compositor_recycling.patch

@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index de722efe61cb6823e62f1101b5aa3447f6795687..b258bbb12b5c607e3fec600fbc7bcb376eb00c72 100644
+index b6897c88c2c433e73f092f2ccebf29f097db35b0..478a753393d37bf5dce09cfb415b51f3cd97c017 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -486,7 +486,11 @@
+@@ -475,7 +475,11 @@
      return;
  
    host()->WasHidden();