Bump v13.6.4

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

.github/CODEOWNERS

@@ -12,7 +12,10 @@ DEPS                                    @electron/wg-upgrades
 /script/release                         @electron/wg-releases
 
 # Security WG
-/lib/browser/devtools.ts                @electron/wg-security
-/lib/browser/guest-view-manager.ts      @electron/wg-security
-/lib/browser/guest-window-proxy.ts      @electron/wg-security
 /lib/browser/rpc-server.ts              @electron/wg-security
+
+# Remote Change Disliker
+/lib/browser/remote/                    @nornagon
+/lib/renderer/remote/                   @nornagon
+/lib/renderer/api/remote.ts             @nornagon
+/docs/api/remote.md                     @nornagon

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,58 @@
+---
+name: Bug report
+about: Create a report to help us improve Electron
+
+---
+
+<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
+
+### Preflight Checklist
+<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
+
+* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+* [ ] I have searched the issue tracker for an issue that matches the one I want to file, without success.
+
+### Issue Details
+
+* **Electron Version:**
+  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
+* **Operating System:**
+  * <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
+* **Last Known Working Electron version:**
+  * <!-- (if applicable) e.g. 3.1.0 -->
+
+### Expected Behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Actual Behavior
+<!-- A clear and concise description of what actually happened. -->
+
+### To Reproduce
+<!--
+Your best chance of getting this bug looked at quickly is to provide an example.
+-->
+
+<!--
+For bugs that can be encapsulated in a small experiment, you can use Electron Fiddle (https://github.com/electron/fiddle) to publish your example to a GitHub Gist and link it your bug report.
+-->
+
+<!--
+If Fiddle is insufficient to produce an example, please provide an example REPOSITORY that can be cloned and run. You can fork electron-quick-start (https://github.com/electron/electron-quick-start) and include a link to the branch with your changes.
+-->
+
+<!--
+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
+```sh
+$ git clone $YOUR_URL -b $BRANCH
+$ npm install
+$ npm start || electron .
+```
+-->
+
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Additional Information
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,77 +0,0 @@
-name: Bug Report
-description: Report an Electron bug
-title: "[Bug]: "
-labels: "bug :beetle:"
-body:
-- type: checkboxes
-  attributes:
-    label: Preflight Checklist
-    description: Please ensure you've completed all of the following.
-    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-        required: true
-      - label: I have searched the [issue tracker](https://www.github.com/electron/electron/issues) for a feature request that matches the one I want to file, without success.
-        required: true
-- type: input
-  attributes:
-    label: Electron Version
-    description: What version of Electron are you using?
-    placeholder: 12.0.0
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What operating system are you using?
-    options:
-      - Windows
-      - macOS
-      - Ubuntu
-      - Other Linux
-      - Other (specify below)
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Operating System Version
-    description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
-    placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What arch are you using?
-    options:
-      - x64
-      - ia32
-      - arm64 (including Apple Silicon)
-      - Other (specify below)
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Last Known Working Electron version
-    description: What is the last version of Electron this worked in, if applicable?
-    placeholder: 11.0.0
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A clear and concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Actual Behavior
-    description: A clear description of what actually happens.
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Testcase Gist URL
-    description: If you can reproduce the issue in a standalone test case, please use [Electron Fiddle](https://github.com/electron/fiddle) to create one and to publish it as a [GitHub gist](https://gist.github.com) and put the gist URL here. This is **the best way** to ensure this issue is triaged quickly.
-    placeholder: https://gist.github.com/...
-- type: textarea
-  attributes:
-    label: Additional Information
-    description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,19 +1,18 @@
 name: Feature Request
-description: Suggest an idea for Electron
+about: Suggest an idea for Electron
 title: "[Feature Request]: "
-labels: "enhancement :sparkles:"
+labels: "enhancement ✨"
 body:
-- type: checkboxes
+- type: textarea
   attributes:
     label: Preflight Checklist
-    description: Please ensure you've completed all of the following.
-    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-        required: true
-      - label: I have searched the [issue tracker](https://www.github.com/electron/electron/issues) for a feature request that matches the one I want to file, without success.
-        required: true
+    description: Please ensure you've completed the following steps by replacing [ ] with [x]
+    value: |
+      * [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+      * [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+      * [ ] I have searched the issue tracker for a feature request that matches the one I want to file, without success.
+  validations:
+    required: true
 - type: textarea
   attributes:
     label: Problem Description

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md

@@ -0,0 +1,25 @@
+---
+name: Mac App Store Private API Rejection
+about: Your app was rejected from the Mac App Store for using private API's
+
+---
+
+<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
+-->
+
+### Preflight Checklist
+<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
+
+* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+
+### Issue Details
+
+* **Electron Version:** 
+  * <!-- (output of `node_modules/.bin/electron --version`) e.g. 4.0.3 -->
+
+### Rejection Email
+<!-- Paste the contents of your rejection email here, censoring any private information such as app names.-->
+
+### Additional Information
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.yml

@@ -1,30 +0,0 @@
-name: Report Mac App Store Private API Rejection
-description: Your app was rejected from the Mac App Store for using private API's
-title: "[MAS Rejection]: "
-body:
-- type: checkboxes
-  attributes:
-    label: Preflight Checklist
-    description: Please ensure you've completed all of the following.
-    options:
-      - label: I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-        required: true
-      - label: I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-        required: true
-- type: input
-  attributes:
-    label: Electron Version
-    description: What version of Electron are you using?
-    placeholder: 12.0.0
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Rejection Email
-    description: Paste the contents of your rejection email here, censoring any private information such as app names.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Additional Information
-    description: Add any other context about the problem here.

.gitignore

@@ -17,6 +17,24 @@
 *.xcodeproj
 /.idea/
 /dist/
+/external_binaries/
+/out/
+/vendor/.gclient
+/vendor/debian_jessie_mips64-sysroot/
+/vendor/debian_stretch_amd64-sysroot/
+/vendor/debian_stretch_arm-sysroot/
+/vendor/debian_stretch_arm64-sysroot/
+/vendor/debian_stretch_i386-sysroot/
+/vendor/gcc-4.8.3-d197-n64-loongson/
+/vendor/readme-gcc483-loongson.txt
+/vendor/download/
+/vendor/llvm-build/
+/vendor/llvm/
+/vendor/npm/
+/vendor/python_26/
+/vendor/native_mksnapshot
+/vendor/LICENSES.chromium.html
+/vendor/pyyaml
 node_modules/
 SHASUMS256.txt
 **/package-lock.json

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run precommit

.husky/pre-push

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run prepack

BUILD.gn

@@ -35,10 +35,6 @@ if (is_mac) {
   import("//ui/gl/features.gni")
   import("//v8/gni/v8.gni")
   import("build/rules.gni")
-
-  assert(
-      mac_deployment_target == "10.11.0",
-      "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
 if (is_linux) {
@@ -187,6 +183,12 @@ action("electron_js2c") {
          rebase_path(sources, root_build_dir)
 }
 
+action("generate_config_gypi") {
+  outputs = [ "$root_gen_dir/config.gypi" ]
+  script = "script/generate-config-gypi.py"
+  args = rebase_path(outputs) + [ target_cpu ]
+}
+
 target_gen_default_app_js = "$target_gen_dir/js/default_app"
 
 typescript_build("default_app_js") {
@@ -339,7 +341,6 @@ source_set("electron_lib") {
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
-    "//components/security_state/content",
     "//components/upload_list",
     "//components/user_prefs",
     "//components/viz/host",
@@ -352,6 +353,7 @@ source_set("electron_lib") {
     "//device/bluetooth",
     "//device/bluetooth/public/cpp",
     "//gin",
+    "//media/blink:blink",
     "//media/capture/mojom:video_capture",
     "//media/mojo/mojom",
     "//net:extras",
@@ -368,7 +370,6 @@ source_set("electron_lib") {
     "//skia",
     "//third_party/blink/public:blink",
     "//third_party/blink/public:blink_devtools_inspector_resources",
-    "//third_party/blink/public/platform/media",
     "//third_party/boringssl",
     "//third_party/electron_node:node_lib",
     "//third_party/inspector_protocol:crdtp",
@@ -446,10 +447,7 @@ source_set("electron_lib") {
   }
 
   if (is_linux) {
-    deps += [
-      "//build/config/linux/gtk:gtkprint",
-      "//components/crash/content/browser",
-    ]
+    deps += [ "//components/crash/content/browser" ]
   }
 
   if (is_mac) {
@@ -521,6 +519,10 @@ source_set("electron_lib") {
     ]
     if (use_x11) {
       sources += filenames.lib_sources_linux_x11
+      deps += [
+        "//ui/gfx/x",
+        "//ui/gtk/x",
+      ]
     }
     configs += [ ":gio_unix" ]
     defines += [
@@ -624,8 +626,6 @@ source_set("electron_lib") {
     sources += [
       "shell/browser/printing/print_preview_message_handler.cc",
       "shell/browser/printing/print_preview_message_handler.h",
-      "shell/browser/printing/print_view_manager_electron.cc",
-      "shell/browser/printing/print_view_manager_electron.h",
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
       "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
@@ -1175,6 +1175,11 @@ if (is_mac) {
         "//build/config/win:delayloads",
       ]
 
+      if (target_cpu == "arm64") {
+        configs -= [ "//build/config/win:cfi_linker" ]
+        ldflags += [ "/guard:cf,nolongjmp" ]
+      }
+
       if (current_cpu == "x86") {
         # Set the initial stack size to 0.5MiB, instead of the 1.5MiB needed by
         # Chrome's main thread. This saves significant memory on threads (like
@@ -1404,8 +1409,7 @@ dist_zip("hunspell_dictionaries_zip") {
 }
 
 copy("libcxx_headers") {
-  sources = libcxx_headers + libcxx_licenses +
-            [ "//buildtools/third_party/libc++/__config_site" ]
+  sources = libcxx_headers + libcxx_licenses
   outputs = [ "$target_gen_dir/electron_libcxx_include/{{source_root_relative_dir}}/{{source_file_part}}" ]
 }
 

DEPS

@@ -15,14 +15,11 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '93.0.4577.25',
+    '91.0.4472.164',
   'node_version':
-    'v14.17.0',
+    'v14.16.0',
   'nan_version':
-    # The following commit hash of NAN is v2.14.2 with *only* changes to the
-    # test suite. This should be updated to a specific tag when one becomes
-    # available.
-    '65b32af46e9d7fab2e4ff657751205b3865f4920',
+    'v2.14.2',
   'squirrel.mac_version':
     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
 
@@ -94,7 +91,7 @@ deps = {
     'url': (Var("nodejs_git")) + '/node.git@' + (Var("node_version")),
     'condition': 'checkout_node and process_deps',
   },
-  'src/third_party/pyyaml': {
+  'src/electron/vendor/pyyaml': {
     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
     'condition': 'checkout_pyyaml and process_deps',
   },

ELECTRON_VERSION

@@ -1 +1 @@
-14.0.0-beta.23
+13.6.4

azure-pipelines-woa.yml

@@ -64,7 +64,7 @@ steps:
     set npm_config_arch=arm64
     cd electron
     # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion --disable-gpu
   displayName: 'Run Electron tests'
   env:
     ELECTRON_OUT_DIR: Default

build/dump_syms.py

@@ -39,7 +39,7 @@ def main(dump_syms, binary, out_dir, stamp_file, dsym_file=None):
     args += ["-g", dsym_file]
   args += [binary]
 
-  symbol_data = subprocess.check_output(args).decode(sys.stdout.encoding)
+  symbol_data = subprocess.check_output(args)
   symbol_path = os.path.join(out_dir, get_symbol_path(symbol_data))
   mkdir_p(os.path.dirname(symbol_path))
 

build/webpack/webpack.config.base.js

@@ -61,6 +61,13 @@ module.exports = ({
       );
     }
 
+    if (defines.ENABLE_REMOTE_MODULE === 'false') {
+      ignoredModules.push(
+        '@electron/internal/browser/remote/server',
+        '@electron/internal/renderer/api/remote'
+      );
+    }
+
     if (defines.ENABLE_VIEWS_API === 'false') {
       ignoredModules.push(
         '@electron/internal/browser/api/views/image-view.js'

build/zip.py

@@ -39,8 +39,7 @@ PATHS_TO_SKIP = [
   './crashpad_handler',
   # Skip because these are outputs that we don't need.
   'resources/inspector',
-  'gen/third_party/devtools-frontend/src',
-  'gen/ui/webui'
+  'gen/third_party/devtools-frontend/src'
 ]
 
 def skip_path(dep, dist_zip, target_cpu):

buildflags/BUILD.gn

@@ -12,6 +12,7 @@ buildflag_header("buildflags") {
     "ENABLE_DESKTOP_CAPTURER=$enable_desktop_capturer",
     "ENABLE_RUN_AS_NODE=$enable_run_as_node",
     "ENABLE_OSR=$enable_osr",
+    "ENABLE_REMOTE_MODULE=$enable_remote_module",
     "ENABLE_VIEWS_API=$enable_views_api",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
     "ENABLE_TTS=$enable_tts",

buildflags/buildflags.gni

@@ -10,6 +10,8 @@ declare_args() {
 
   enable_osr = true
 
+  enable_remote_module = true
+
   enable_views_api = true
 
   enable_pdf_viewer = true

chromium_src/BUILD.gn

@@ -43,6 +43,8 @@ static_library("chrome") {
     "//chrome/browser/predictors/proxy_lookup_client_impl.h",
     "//chrome/browser/predictors/resolve_host_client_impl.cc",
     "//chrome/browser/predictors/resolve_host_client_impl.h",
+    "//chrome/browser/ssl/security_state_tab_helper.cc",
+    "//chrome/browser/ssl/security_state_tab_helper.h",
     "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
     "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
     "//extensions/browser/app_window/size_constraints.cc",
@@ -64,8 +66,11 @@ static_library("chrome") {
       "//chrome/browser/extensions/global_shortcut_listener_win.cc",
       "//chrome/browser/extensions/global_shortcut_listener_win.h",
       "//chrome/browser/icon_loader_win.cc",
+      "//chrome/browser/ui/frame/window_frame_util.h",
+      "//chrome/browser/ui/view_ids.h",
       "//chrome/browser/win/chrome_process_finder.cc",
       "//chrome/browser/win/chrome_process_finder.h",
+      "//chrome/browser/win/titlebar_config.h",
       "//chrome/child/v8_crashpad_support_win.cc",
       "//chrome/child/v8_crashpad_support_win.h",
     ]
@@ -78,6 +83,7 @@ static_library("chrome") {
     "//components/keyed_service/content",
     "//components/paint_preview/buildflags",
     "//components/proxy_config",
+    "//components/security_state/content",
     "//content/public/browser",
     "//services/strings",
   ]
@@ -88,10 +94,6 @@ static_library("chrome") {
     "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
-  if (enable_basic_printing && is_win) {
-    deps += [ "//chrome/common:cloud_print_utility_mojom" ]
-  }
-
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
     if (use_x11 || use_ozone) {
@@ -222,6 +224,8 @@ static_library("chrome") {
       "//chrome/browser/printing/print_job_worker.h",
       "//chrome/browser/printing/print_view_manager_base.cc",
       "//chrome/browser/printing/print_view_manager_base.h",
+      "//chrome/browser/printing/print_view_manager_basic.cc",
+      "//chrome/browser/printing/print_view_manager_basic.h",
       "//chrome/browser/printing/printer_query.cc",
       "//chrome/browser/printing/printer_query.h",
       "//chrome/browser/printing/printing_service.cc",
@@ -346,17 +350,13 @@ source_set("plugins") {
   sources += [
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
   ]
   if (enable_pdf_viewer) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    ]
-    if (enable_pdf_viewer) {
-      deps += [ "//components/pdf/renderer" ]
-    }
+    deps += [ "//components/pdf/renderer" ]
   }
   deps += [
     "//components/strings",

chromium_src/chrome/browser/certificate_manager_model.cc

@@ -157,14 +157,15 @@ void CertificateManagerModel::GetCertDBOnIOThread(
     CreationCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  auto split_callback = base::SplitOnceCallback(base::BindOnce(
-      &CertificateManagerModel::DidGetCertDBOnIOThread, std::move(callback)));
+  auto did_get_cert_db_callback = base::AdaptCallbackForRepeating(
+      base::BindOnce(&CertificateManagerModel::DidGetCertDBOnIOThread,
+                     std::move(callback)));
 
-  net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
-      context, std::move(split_callback.first));
+  net::NSSCertDatabase* cert_db =
+      GetNSSCertDatabaseForResourceContext(context, did_get_cert_db_callback);
 
   // If the NSS database was already available, |cert_db| is non-null and
   // |did_get_cert_db_callback| has not been called. Call it explicitly.
   if (cert_db)
-    std::move(split_callback.second).Run(cert_db);
+    did_get_cert_db_callback.Run(cert_db);
 }

chromium_src/chrome/browser/process_singleton.h

@@ -158,7 +158,7 @@ class ProcessSingleton {
 
   // Function to call when the other process is hung and needs to be killed.
   // Allows overriding for tests.
-  base::RepeatingCallback<void(int)> kill_callback_;
+  base::Callback<void(int)> kill_callback_;
 
   // Path in file system to the socket.
   base::FilePath socket_path_;

chromium_src/chrome/browser/process_singleton_win.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/process_singleton.h"
 
-#include <windows.h>
 #include <shellapi.h>
 
 #include "base/base_paths.h"

default_app/default_app.ts

@@ -52,7 +52,8 @@ async function createWindow (backgroundColor?: string) {
     webPreferences: {
       preload: path.resolve(__dirname, 'preload.js'),
       contextIsolation: true,
-      sandbox: true
+      sandbox: true,
+      enableRemoteModule: false
     },
     useContentSize: true,
     show: false

default_app/main.ts

@@ -109,7 +109,7 @@ function loadApplicationPackage (packagePath: string) {
 
     try {
       const filePath = Module._resolveFilename(packagePath, module, true);
-      app.setAppPath(appPath || path.dirname(filePath));
+      app._setDefaultAppPaths(appPath || path.dirname(filePath));
     } catch (e) {
       showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`);
       return;

docs/api/app.md

@@ -507,6 +507,64 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process of `webContents`.
 Calling `event.preventDefault()` will make it return empty sources.
 
+### Event: 'remote-require' _Deprecated_
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `moduleName` String
+
+Emitted when `remote.require()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+### Event: 'remote-get-global' _Deprecated_
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `globalName` String
+
+Emitted when `remote.getGlobal()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the global from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+### Event: 'remote-get-builtin' _Deprecated_
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `moduleName` String
+
+Emitted when `remote.getBuiltin()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+### Event: 'remote-get-current-window' _Deprecated_
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+
+Emitted when `remote.getCurrentWindow()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+### Event: 'remote-get-current-web-contents' _Deprecated_
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+
+Emitted when `remote.getCurrentWebContents()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ## Methods
 
 The `app` object has the following methods:
@@ -1427,6 +1485,19 @@ This is the user agent that will be used when no user agent is set at the
 app has the same user agent.  Set to a custom value as early as possible
 in your app's initialization to ensure that your overridden value is used.
 
+### `app.allowRendererProcessReuse`
+
+A `Boolean` which when `true` disables the overrides that Electron has in place
+to ensure renderer processes are restarted on every navigation.  The current
+default value for this property is `true`.
+
+The intention is for these overrides to become disabled by default and then at
+some point in the future this property will be removed.  This property impacts
+which native modules you can use in the renderer process.  For more information
+on the direction Electron is going with renderer process restarts and usage of
+native modules in the renderer process please check out this
+[Tracking Issue](https://github.com/electron/electron/issues/18397).
+
 ### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
 
 A `Boolean` which when `true` indicates that the app is currently running

docs/api/auto-updater.md

@@ -43,7 +43,7 @@ The installer generated with Squirrel will create a shortcut icon with an
 same ID for your app with `app.setAppUserModelId` API, otherwise Windows will
 not be able to pin your app properly in task bar.
 
-Unlike Squirrel.Mac, Windows can host updates on S3 or any other static file host.
+Like Squirrel.Mac, Windows can host updates on S3 or any other static file host.
 You can read the documents of [Squirrel.Windows][squirrel-windows] to get more details
 about how Squirrel.Windows works.
 
@@ -118,9 +118,6 @@ Returns `String` - The current update feed URL.
 Asks the server whether there is an update. You must call `setFeedURL` before
 using this API.
 
-**Note:** If an update is available it will be downloaded automatically.
-Calling `autoUpdater.checkForUpdates()` twice will download the update two times.
-
 ### `autoUpdater.quitAndInstall()`
 
 Restarts the app and installs the update after it has been downloaded. It

docs/api/browser-window.md

@@ -14,7 +14,7 @@ const win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 
 // Or load a local HTML file
-win.loadFile('index.html')
+win.loadURL(`file://${__dirname}/app/index.html`)
 ```
 
 ## Frameless window
@@ -213,16 +213,13 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
     * `active` - The backdrop should always appear active.
     * `inactive` - The backdrop should always appear inactive.
-  * `titleBarStyle` String (optional) - The style of window title bar.
+  * `titleBarStyle` String (optional) _macOS_ _Windows_ - The style of window title bar.
     Default is `default`. Possible values are:
-    * `default` - Results in the standard gray opaque Mac title
-      bar.
-    * `hidden` - Results in a hidden title bar and a full size content window, yet
-      the title bar still has the standard window controls ("traffic lights") in
-      the top left.
-    * `hiddenInset` - Results in a hidden title bar with an alternative look
+    * `default` - Results in the standard title bar for macOS or Windows respectively.
+    * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
+    * `hiddenInset` - Only on macOS, results in a hidden title bar with an alternative look
       where the traffic light buttons are slightly more inset from the window edge.
-    * `customButtonsOnHover` - Results in a hidden title bar and a full size
+    * `customButtonsOnHover` - Only on macOS, results in a hidden title bar and a full size
       content window, the traffic light buttons will display when being hovered
       over in the top left of the window.  **Note:** This option is currently
       experimental.
@@ -273,6 +270,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       OS-level sandbox and disabling the Node.js engine. This is not the same as
       the `nodeIntegration` option and the APIs available to the preload script
       are more limited. Read more about the option [here](../tutorial/sandbox.md).
+    * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
+      Default is `false`.
     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
       page. Instead of passing the Session object directly, you can also choose to
       use the `partition` option instead, which accepts a partition string. When
@@ -284,6 +283,13 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       same `partition`. If there is no `persist:` prefix, the page will use an
       in-memory session. By assigning the same `partition`, multiple pages can share
       the same session. Default is the default session.
+    * `affinity` String (optional) - When specified, web pages with the same
+      `affinity` will run in the same renderer process. Note that due to reusing
+      the renderer process, certain `webPreferences` options will also be shared
+      between the web pages even when you specified different values for them,
+      including but not limited to `preload`, `sandbox` and `nodeIntegration`.
+      So it is suggested to use exact same `webPreferences` for web pages with
+      the same `affinity`. _Deprecated_
     * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
       `300%`. Default is `1.0`.
     * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -341,10 +347,12 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       [Chrome Content Scripts][chrome-content-scripts].  You can access this
       context in the dev tools by selecting the 'Electron Isolated Context'
       entry in the combo box at the top of the Console tab.
+    * `worldSafeExecuteJavaScript` Boolean (optional) - If true, values returned from `webFrame.executeJavaScript` will be sanitized to ensure JS values
+      can't unsafely cross between worlds when using `contextIsolation`. Defaults to `true`. _Deprecated_
     * `nativeWindowOpen` Boolean (optional) - Whether to use native
       `window.open()`. Defaults to `false`. Child windows will always have node
-      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** The default
-      value will be changing to `true` in Electron 15.
+      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently
+      experimental.
     * `webviewTag` Boolean (optional) - Whether to enable the [`<webview>` tag](webview-tag.md).
       Defaults to `false`. **Note:** The
       `preload` script configured for the `<webview>` will have node integration
@@ -392,10 +400,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       contain the layout of the document—without requiring scrolling. Enabling
       this will cause the `preferred-size-changed` event to be emitted on the
       `WebContents` when the preferred size changes. Default is `false`.
-  * `titleBarOverlay` Boolean (optional) -  On macOS, when using a frameless window in conjunction with
-    `win.setWindowButtonVisibility(true)` or using a `titleBarStyle` so that the traffic lights are visible,
-    this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and
-    [CSS Environment Variables][overlay-css-env-vars].  Default is `false`.
+  * `titleBarOverlay` [OverlayOptions](structures/overlay-options.md) | Boolean (optional) -  When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.  On Windows, the [OverlayOptions](structures/overlay-options.md) can be used instead of a boolean to specify colors for the overlay.
 
 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -755,10 +760,6 @@ A `Boolean` property that determines whether the window is in simple (pre-Lion)
 
 A `Boolean` property that determines whether the window is in fullscreen mode.
 
-#### `win.focusable` _Windows_ _macOS_
-
-A `Boolean` property that determines whether the window is focusable.
-
 #### `win.visibleOnAllWorkspaces`
 
 A `Boolean` property that determines whether the window is visible on all workspaces.
@@ -982,7 +983,7 @@ the player itself we would call this function with arguments of 16/9 and
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.
 
-The aspect ratio is not respected when window is resized programmingly with
+The aspect ratio is not respected when window is resized programmatically with
 APIs like `win.setSize`.
 
 #### `win.setBackgroundColor(backgroundColor)`
@@ -1677,10 +1678,6 @@ Changes whether the window can be focused.
 
 On macOS it does not remove the focus from the window.
 
-#### `win.isFocusable()` _macOS_ _Windows_
-
-Returns whether the window can be focused.
-
 #### `win.setParentWindow(parent)`
 
 * `parent` BrowserWindow | null
@@ -1690,7 +1687,7 @@ current window into a top-level window.
 
 #### `win.getParentWindow()`
 
-Returns `BrowserWindow` - The parent window.
+Returns `BrowserWindow | null` - The parent window or `null` if there is no parent.
 
 #### `win.getChildWindows()`
 

docs/api/clipboard.md

@@ -199,7 +199,7 @@ const { clipboard } = require('electron')
 
 const hasFormat = clipboard.has('<p>selection</p>')
 console.log(hasFormat)
-// 'true' or 'false'
+// 'true' or 'false
 ```
 
 ### `clipboard.read(format)` _Experimental_
@@ -208,10 +208,6 @@ console.log(hasFormat)
 
 Returns `String` - Reads `format` type from the clipboard.
 
-`format` should contain valid ASCII characters and have `/` separator.
-`a/c`, `a/bc` are valid formats while `/abc`, `abc/`, `a/`, `/a`, `a`
-are not valid.
-
 ### `clipboard.readBuffer(format)` _Experimental_
 
 * `format` String
@@ -222,9 +218,9 @@ Returns `Buffer` - Reads `format` type from the clipboard.
 const { clipboard } = require('electron')
 
 const buffer = Buffer.from('this is binary', 'utf8')
-clipboard.writeBuffer('public/utf8-plain-text', buffer)
+clipboard.writeBuffer('public.utf8-plain-text', buffer)
 
-const ret = clipboard.readBuffer('public/utf8-plain-text')
+const ret = clipboard.readBuffer('public.utf8-plain-text')
 
 console.log(buffer.equals(out))
 // true
@@ -242,7 +238,7 @@ Writes the `buffer` into the clipboard as `format`.
 const { clipboard } = require('electron')
 
 const buffer = Buffer.from('writeBuffer', 'utf8')
-clipboard.writeBuffer('public/utf8-plain-text', buffer)
+clipboard.writeBuffer('public.utf8-plain-text', buffer)
 ```
 
 ### `clipboard.write(data[, type])`

docs/api/command-line-switches.md

@@ -66,23 +66,19 @@ Forces the maximum disk space to be used by the disk cache, in bytes.
 Enables caller stack logging for the following APIs (filtering events):
 
 * `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+* `remote.require()` / `remote-require`
+* `remote.getGlobal()` / `remote-get-builtin`
+* `remote.getBuiltin()` / `remote-get-global`
+* `remote.getCurrentWindow()` / `remote-get-current-window`
+* `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
 
-### --enable-logging[=file]
+### --enable-logging
 
-Prints Chromium's logging to stderr (or a log file).
+Prints Chromium's logging into console.
 
-The `ELECTRON_ENABLE_LOGGING` environment variable has the same effect as
-passing `--enable-logging`.
-
-Passing `--enable-logging` will result in logs being printed on stderr.
-Passing `--enable-logging=file` will result in logs being saved to the file
-specified by `--log-file=...`, or to `electron_debug.log` in the user-data
-directory if `--log-file` is not specified.
-
-> **Note:** On Windows, logs from child processes cannot be sent to stderr.
-> Logging to a file is the most reliable way to collect logs on Windows.
-
-See also `--log-file`, `--log-level`, `--v`, and `--vmodule`.
+This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
+earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
+environment variable to achieve the same effect.
 
 ### --force-fieldtrials=`trials`
 
@@ -135,37 +131,10 @@ See the [Node.js documentation][node-cli] or run `node --help` in your terminal
 
 Set a custom locale.
 
-### --log-file=`path`
-
-If `--enable-logging` is specified, logs will be written to the given path. The
-parent directory must exist.
-
-Setting the `ELECTRON_LOG_FILE` environment variable is equivalent to passing
-this flag. If both are present, the command-line switch takes precedence.
-
 ### --log-net-log=`path`
 
 Enables net log events to be saved and writes them to `path`.
 
-### --log-level=`N`
-
-Sets the verbosity of logging when used together with `--enable-logging`.
-`N` should be one of [Chrome's LogSeverities][severities].
-
-Note that two complimentary logging mechanisms in Chromium -- `LOG()`
-and `VLOG()` -- are controlled by different switches. `--log-level`
-controls `LOG()` messages, while `--v` and `--vmodule` control `VLOG()`
-messages. So you may want to use a combination of these three switches
-depending on the granularity you want and what logging calls are made
-by the code you're trying to watch.
-
-See [Chromium Logging source][logging] for more information on how
-`LOG()` and `VLOG()` interact. Loosely speaking, `VLOG()` can be thought
-of as sub-levels / per-module levels inside `LOG(INFO)` to control the
-firehose of `LOG(INFO)` data.
-
-See also `--enable-logging`, `--log-level`, `--v`, and `--vmodule`.
-
 ### --no-proxy-server
 
 Don't use a proxy server and always make direct connections. Overrides any other
@@ -217,8 +186,6 @@ positive values are used for V-logging levels.
 
 This switch only works when `--enable-logging` is also passed.
 
-See also `--enable-logging`, `--log-level`, and `--vmodule`.
-
 ### --vmodule=`pattern`
 
 Gives the per-module maximal V-logging levels to override the value given by
@@ -231,8 +198,6 @@ logging level for all code in the source files under a `foo/bar` directory.
 
 This switch only works when `--enable-logging` is also passed.
 
-See also `--enable-logging`, `--log-level`, and `--v`.
-
 ### --force_high_performance_gpu
 
 Force using discrete GPU when there are multiple GPUs available.
@@ -280,8 +245,4 @@ By default inspector websocket url is available in stderr and under /json/list e
 [ready]: app.md#event-ready
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
-[logging]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h
 [node-cli]: https://nodejs.org/api/cli.html
-[play-silent-audio]: https://github.com/atom/atom/pull/9485/files
-[ready]: app.md#event-ready
-[severities]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h?q=logging::LogSeverity&ss=chromium

docs/api/dialog.md

@@ -233,6 +233,10 @@ expanding and collapsing the dialog.
     be selected by default when the message box opens.
   * `title` String (optional) - Title of the message box, some platforms will not show it.
   * `detail` String (optional) - Extra information of the message.
+  * `checkboxLabel` String (optional) - If provided, the message box will
+    include a checkbox with the given label.
+  * `checkboxChecked` Boolean (optional) - Initial checked state of the
+    checkbox. `false` by default.
   * `icon` ([NativeImage](native-image.md) | String) (optional)
   * `cancelId` Integer (optional) - The index of the button to be used to cancel the dialog, via
     the `Esc` key. By default this is assigned to the first button with "cancel" or "no" as the

docs/api/environment-variables.md

@@ -118,19 +118,7 @@ debugging purposes.
 
 ### `ELECTRON_ENABLE_LOGGING`
 
-Prints Chromium's internal logging to the console.
-
-Setting this variable is the same as passing `--enable-logging`
-on the command line. For more info, see `--enable-logging` in [command-line
-switches](./command-line-switches.md#enable-loggingfile).
-
-### `ELECTRON_LOG_FILE`
-
-Sets the file destination for Chromium's internal logging.
-
-Setting this variable is the same as passing `--log-file`
-on the command line. For more info, see `--log-file` in [command-line
-switches](./command-line-switches.md#log-filepath).
+Prints Chrome's internal logging to the console.
 
 ### `ELECTRON_DEBUG_DRAG_REGIONS`
 
@@ -139,8 +127,7 @@ green and non-draggable regions will be colored red to aid debugging.
 
 ### `ELECTRON_DEBUG_NOTIFICATIONS`
 
-Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common a
-tions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
+Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
 
 Sample output:
 

docs/api/extensions.md

@@ -78,7 +78,6 @@ The following methods of `chrome.runtime` are supported:
 - `chrome.runtime.getURL`
 - `chrome.runtime.connect`
 - `chrome.runtime.sendMessage`
-- `chrome.runtime.reload`
 
 The following events of `chrome.runtime` are supported:
 

docs/api/frameless-window.md

@@ -18,17 +18,17 @@ const win = new BrowserWindow({ width: 800, height: 600, frame: false })
 win.show()
 ```
 
-### Alternatives on macOS
+### Alternatives
 
-There's an alternative way to specify a chromeless window.
+There's an alternative way to specify a chromeless window on macOS and Windows.
 Instead of setting `frame` to `false` which disables both the titlebar and window controls,
 you may want to have the title bar hidden and your content extend to the full window size,
-yet still preserve the window controls ("traffic lights") for standard window actions.
+yet still preserve the window controls ("traffic lights" on macOS) for standard window actions.
 You can do so by specifying the `titleBarStyle` option:
 
 #### `hidden`
 
-Results in a hidden title bar and a full size content window, yet the title bar still has the standard window controls (“traffic lights”) in the top left.
+Results in a hidden title bar and a full size content window. On macOS, the title bar still has the standard window controls (“traffic lights”) in the top left.
 
 ```javascript
 const { BrowserWindow } = require('electron')
@@ -36,6 +36,8 @@ const win = new BrowserWindow({ titleBarStyle: 'hidden' })
 win.show()
 ```
 
+### Alternatives on macOS
+
 #### `hiddenInset`
 
 Results in a hidden title bar with an alternative look where the traffic light buttons are slightly more inset from the window edge.
@@ -63,19 +65,33 @@ win.show()
 
 ## Windows Control Overlay
 
-On macOS, when using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` or using one of the `titleBarStyle`s described above so
-that the traffic lights are visible, you can access the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and
-[CSS Environment Variables][overlay-css-env-vars] by setting the `titleBarOverlay` option to true:
+When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS, using one of the `titleBarStyle`s as described above so
+that the traffic lights are visible, or using `titleBarStyle: hidden` on Windows, you can access the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and
+[CSS Environment Variables][overlay-css-env-vars] by setting the `titleBarOverlay` option to true. Specifying `true` will result in an overlay with default system colors.
+
+On Windows, you can also specify the color of the overlay and its symbols by setting `titleBarOverlay` to an object with the options `color` and `symbolColor`. If an option is not specified, the color will default to its system color for the window control buttons:
 
 ```javascript
 const { BrowserWindow } = require('electron')
 const win = new BrowserWindow({
-  titleBarStyle: 'hiddenInset',
+  titleBarStyle: 'hidden',
   titleBarOverlay: true
 })
 win.show()
 ```
 
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({
+  titleBarStyle: 'hidden',
+  titleBarOverlay: {
+    color: '#2f3241',
+    symbolColor: '#74b1be'
+  }
+})
+win.show()
+```
+
 ## Transparent window
 
 By setting the `transparent` option to `true`, you can also make the frameless

docs/api/ipc-main.md

@@ -40,8 +40,6 @@ ipcMain.on('synchronous-message', (event, arg) => {
 
 ```javascript
 // In renderer process (web page).
-// NB. Electron APIs are only accessible from preload, unless contextIsolation is disabled.
-// See https://www.electronjs.org/docs/tutorial/process-model#preload-scripts for more details.
 const { ipcRenderer } = require('electron')
 console.log(ipcRenderer.sendSync('synchronous-message', 'ping')) // prints "pong"
 

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
     * `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`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - 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`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.
@@ -155,7 +155,7 @@ A `String` indicating the type of the item. Can be `normal`, `separator`, `subme
 
 #### `menuItem.role`
 
-A `String` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`
+A `String` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`
 
 #### `menuItem.accelerator`
 

docs/api/power-monitor.md

@@ -8,11 +8,11 @@ Process: [Main](../glossary.md#main-process)
 
 The `powerMonitor` module emits the following events:
 
-### Event: 'suspend'
+### Event: 'suspend' _macOS_ _Windows_
 
 Emitted when the system is suspending.
 
-### Event: 'resume'
+### Event: 'resume' _macOS_ _Windows_
 
 Emitted when system is resuming.
 

docs/api/remote.md

@@ -0,0 +1,217 @@
+# remote
+
+> Use main process modules from the renderer process.
+
+Process: [Renderer](../glossary.md#renderer-process)
+
+> ⚠️ WARNING ⚠️
+> The `remote` module is [deprecated](https://github.com/electron/electron/issues/21408).
+> Instead of `remote`, use [`ipcRenderer`](ipc-renderer.md) and
+> [`ipcMain`](ipc-main.md).
+>
+> Read more about why the `remote` module is deprecated [here](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).
+>
+> If you still want to use `remote` despite the performance and security
+> concerns, see [@electron/remote](https://github.com/electron/remote).
+
+The `remote` module provides a simple way to do inter-process communication
+(IPC) between the renderer process (web page) and the main process.
+
+In Electron, GUI-related modules (such as `dialog`, `menu` etc.) are only
+available in the main process, not in the renderer process. In order to use them
+from the renderer process, the `ipc` module is necessary to send inter-process
+messages to the main process. With the `remote` module, you can invoke methods
+of the main process object without explicitly sending inter-process messages,
+similar to Java's [RMI][rmi]. An example of creating a browser window from a
+renderer process:
+
+```javascript
+const { BrowserWindow } = require('electron').remote
+const win = new BrowserWindow({ width: 800, height: 600 })
+win.loadURL('https://github.com')
+```
+
+**Note:** For the reverse (access the renderer process from the main process),
+you can use [webContents.executeJavaScript](web-contents.md#contentsexecutejavascriptcode-usergesture).
+
+**Note:** The remote module can be disabled for security reasons in the following contexts:
+
+* [`BrowserWindow`](browser-window.md) - by setting the `enableRemoteModule` option to `false`.
+* [`<webview>`](webview-tag.md) - by setting the `enableremotemodule` attribute to `false`.
+
+## Remote Objects
+
+Each object (including functions) returned by the `remote` module represents an
+object in the main process (we call it a remote object or remote function).
+When you invoke methods of a remote object, call a remote function, or create
+a new object with the remote constructor (function), you are actually sending
+synchronous inter-process messages.
+
+In the example above, both [`BrowserWindow`](browser-window.md) and `win` were remote objects and
+`new BrowserWindow` didn't create a `BrowserWindow` object in the renderer
+process. Instead, it created a `BrowserWindow` object in the main process and
+returned the corresponding remote object in the renderer process, namely the
+`win` object.
+
+**Note:** Only [enumerable properties][enumerable-properties] which are present
+when the remote object is first referenced are accessible via remote.
+
+**Note:** Arrays and Buffers are copied over IPC when accessed via the `remote`
+module. Modifying them in the renderer process does not modify them in the main
+process and vice versa.
+
+## Lifetime of Remote Objects
+
+Electron makes sure that as long as the remote object in the renderer process
+lives (in other words, has not been garbage collected), the corresponding object
+in the main process will not be released. When the remote object has been
+garbage collected, the corresponding object in the main process will be
+dereferenced.
+
+If the remote object is leaked in the renderer process (e.g. stored in a map but
+never freed), the corresponding object in the main process will also be leaked,
+so you should be very careful not to leak remote objects.
+
+Primary value types like strings and numbers, however, are sent by copy.
+
+## Passing callbacks to the main process
+
+Code in the main process can accept callbacks from the renderer - for instance
+the `remote` module - but you should be extremely careful when using this
+feature.
+
+First, in order to avoid deadlocks, the callbacks passed to the main process
+are called asynchronously. You should not expect the main process to
+get the return value of the passed callbacks.
+
+For instance you can't use a function from the renderer process in an
+`Array.map` called in the main process:
+
+```javascript
+// main process mapNumbers.js
+exports.withRendererCallback = (mapper) => {
+  return [1, 2, 3].map(mapper)
+}
+
+exports.withLocalCallback = () => {
+  return [1, 2, 3].map(x => x + 1)
+}
+```
+
+```javascript
+// renderer process
+const mapNumbers = require('electron').remote.require('./mapNumbers')
+const withRendererCb = mapNumbers.withRendererCallback(x => x + 1)
+const withLocalCb = mapNumbers.withLocalCallback()
+
+console.log(withRendererCb, withLocalCb)
+// [undefined, undefined, undefined], [2, 3, 4]
+```
+
+As you can see, the renderer callback's synchronous return value was not as
+expected, and didn't match the return value of an identical callback that lives
+in the main process.
+
+Second, the callbacks passed to the main process will persist until the
+main process garbage-collects them.
+
+For example, the following code seems innocent at first glance. It installs a
+callback for the `close` event on a remote object:
+
+```javascript
+require('electron').remote.getCurrentWindow().on('close', () => {
+  // window was closed...
+})
+```
+
+But remember the callback is referenced by the main process until you
+explicitly uninstall it. If you do not, each time you reload your window the
+callback will be installed again, leaking one callback for each restart.
+
+To make things worse, since the context of previously installed callbacks has
+been released, exceptions will be raised in the main process when the `close`
+event is emitted.
+
+To avoid this problem, ensure you clean up any references to renderer callbacks
+passed to the main process. This involves cleaning up event handlers, or
+ensuring the main process is explicitly told to dereference callbacks that came
+from a renderer process that is exiting.
+
+## Accessing built-in modules in the main process
+
+The built-in modules in the main process are added as getters in the `remote`
+module, so you can use them directly like the `electron` module.
+
+```javascript
+const app = require('electron').remote.app
+console.log(app)
+```
+
+## Methods
+
+The `remote` module has the following methods:
+
+### `remote.getCurrentWindow()`
+
+Returns [`BrowserWindow`](browser-window.md) - The window to which this web page
+belongs.
+
+**Note:** Do not use `removeAllListeners` on [`BrowserWindow`](browser-window.md).
+Use of this can remove all [`blur`](https://developer.mozilla.org/en-US/docs/Web/Events/blur)
+listeners, disable click events on touch bar buttons, and other unintended
+consequences.
+
+### `remote.getCurrentWebContents()`
+
+Returns [`WebContents`](web-contents.md) - The web contents of this web page.
+
+### `remote.getGlobal(name)`
+
+* `name` String
+
+Returns `any` - The global variable of `name` (e.g. `global[name]`) in the main
+process.
+
+## Properties
+
+### `remote.require`
+
+A `NodeJS.Require` function equivalent to `require(module)` in the main process.
+Modules specified by their relative path will resolve relative to the entrypoint
+of the main process.
+
+e.g.
+
+```sh
+project/
+├── main
+│   ├── foo.js
+│   └── index.js
+├── package.json
+└── renderer
+    └── index.js
+```
+
+```js
+// main process: main/index.js
+const { app } = require('electron')
+app.whenReady().then(() => { /* ... */ })
+```
+
+```js
+// some relative module: main/foo.js
+module.exports = 'bar'
+```
+
+```js
+// renderer process: renderer/index.js
+const foo = require('electron').remote.require('./foo') // bar
+```
+
+### `remote.process` _Readonly_
+
+A `NodeJS.Process` object.  The `process` object in the main process. This is the same as
+`remote.getGlobal('process')` but is cached.
+
+[rmi]: https://en.wikipedia.org/wiki/Java_remote_method_invocation
+[enumerable-properties]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Enumerability_and_ownership_of_properties

docs/api/session.md

@@ -179,7 +179,7 @@ Emitted when a hunspell dictionary file download fails.  For details
 on the failure you should collect a netlog and inspect the download
 request.
 
-#### Event: 'select-serial-port'
+#### Event: 'select-serial-port' _Experimental_
 
 Returns:
 
@@ -196,15 +196,24 @@ cancel the request.  Additionally, permissioning on `navigator.serial` can
 be managed by using [ses.setPermissionCheckHandler(handler)](#sessetpermissioncheckhandlerhandler)
 with the `serial` permission.
 
+Because this is an experimental feature it is disabled by default.  To enable this feature, you
+will need to use the `--enable-features=ElectronSerialChooser` command line switch.  Additionally
+because this is an experimental Chromium feature you will need to set `enableBlinkFeatures: 'Serial'`
+on the `webPreferences` property when opening a BrowserWindow.
+
 ```javascript
 const { app, BrowserWindow } = require('electron')
 
 let win = null
+app.commandLine.appendSwitch('enable-features', 'ElectronSerialChooser')
 
 app.whenReady().then(() => {
   win = new BrowserWindow({
     width: 800,
-    height: 600
+    height: 600,
+    webPreferences: {
+      enableBlinkFeatures: 'Serial'
+    }
   })
   win.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
     event.preventDefault()
@@ -220,7 +229,7 @@ app.whenReady().then(() => {
 })
 ```
 
-#### Event: 'serial-port-added'
+#### Event: 'serial-port-added' _Experimental_
 
 Returns:
 
@@ -230,7 +239,7 @@ Returns:
 
 Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
 
-#### Event: 'serial-port-removed'
+#### Event: 'serial-port-removed' _Experimental_
 
 Returns:
 
@@ -497,6 +506,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
     * `permissionGranted` Boolean - Allow or deny the permission.
   * `details` Object - Some properties are only available on certain permission types.
     * `externalURL` String (optional) - The url of the `openExternal` request.
+    * `securityOrigin` String (optional) - The security origin of the `media` request.
     * `mediaTypes` String[] (optional) - The types of media access being requested, elements can be `video`
       or `audio`
     * `requestingUrl` String - The last URL the requesting frame loaded
@@ -522,7 +532,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
 #### `ses.setPermissionCheckHandler(handler)`
 
 * `handler` Function\<Boolean> | null
-  * `webContents` ([WebContents](web-contents.md) | null) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.  Cross origin sub frames making permission checks will pass a `null` webContents to this handler.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
+  * `webContents` ([WebContents](web-contents.md) | null) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.  All cross origin sub frames making permission checks will pass a `null` webContents to this handler, while certain other permission checks such as `notifications` checks will always pass `null`.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
   * `permission` String - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, or `serial`.
   * `requestingOrigin` String - The origin URL of the permission check
   * `details` Object - Some properties are only available on certain permission types.

docs/api/structures/overlay-options.md

@@ -0,0 +1,4 @@
+# OverlayOptions Object
+
+* `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
+* `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.

docs/api/structures/user-default-types.md

@@ -1,12 +0,0 @@
-# UserDefaultTypes Object
-
-* `string` String
-* `boolean` Boolean
-* `integer` Number
-* `float` Number
-* `double` Number
-* `url` String
-* `array` Array\<unknown>
-* `dictionary` Record\<string, unknown>
-
-This type is a helper alias, no object will never exist of this type.

docs/api/system-preferences.md

@@ -159,13 +159,13 @@ Same as `unsubscribeNotification`, but removes the subscriber from `NSWorkspace.
 
 Add the specified defaults to your application's `NSUserDefaults`.
 
-### `systemPreferences.getUserDefault<Type extends keyof UserDefaultTypes>(key, type)` _macOS_
+### `systemPreferences.getUserDefault(key, type)` _macOS_
 
 * `key` String
-* `type` Type - Can be `string`, `boolean`, `integer`, `float`, `double`,
+* `type` String - Can be `string`, `boolean`, `integer`, `float`, `double`,
   `url`, `array` or `dictionary`.
 
-Returns [`UserDefaultTypes[Type]`](structures/user-default-types.md) - The value of `key` in `NSUserDefaults`.
+Returns `any` - The value of `key` in `NSUserDefaults`.
 
 Some popular `key` and `type`s are:
 

docs/api/touch-bar-scrubber.md

@@ -14,7 +14,7 @@ Process: [Main](../glossary.md#main-process)
     * `highlightedIndex` Integer - The index of the item the user touched.
   * `selectedStyle` String (optional) - Selected item style. Can be `background`, `outline` or `none`. Defaults to `none`.
   * `overlayStyle` String (optional) - Selected overlay item style. Can be `background`, `outline` or `none`. Defaults to `none`.
-  * `showArrowButtons` Boolean (optional) - Defaults to `false`.
+  * `showArrowButtons` Boolean (optional) - Whether to show arrow buttons. Defaults to `false` and is only shown if `items` is non-empty.
   * `mode` String (optional) - Can be `fixed` or `free`. The default is `free`.
   * `continuous` Boolean (optional) - Defaults to `true`.
 

docs/api/web-contents.md

@@ -45,6 +45,26 @@ returns `null`.
 Returns `WebContents` | undefined - A WebContents instance with the given ID, or
 `undefined` if there is no WebContents associated with the given ID.
 
+### `webContents.fromDevToolsTargetId(targetId)`
+
+* `targetId` String - The Chrome DevTools Protocol [TargetID](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) associated with the WebContents instance.
+
+Returns `WebContents` | undefined - A WebContents instance with the given TargetID, or
+`undefined` if there is no WebContents associated with the given TargetID.
+
+When communicating with the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/),
+it can be useful to lookup a WebContents instance based on its assigned TargetID.
+
+```js
+async function lookupTargetId (browserWindow) {
+  const wc = browserWindow.webContents
+  await wc.debugger.attach('1.3')
+  const { targetInfo } = await wc.debugger.sendCommand('Target.getTargetInfo')
+  const { targetId } = targetInfo
+  const targetWebContents = await webContents.fromDevToolsTargetId(targetId)
+}
+```
+
 ## Class: WebContents
 
 > Render and control the contents of a BrowserWindow instance.
@@ -147,8 +167,7 @@ Returns:
 * `options` BrowserWindowConstructorOptions - The options which will be used for creating the new
   [`BrowserWindow`](browser-window.md).
 * `additionalFeatures` String[] - The non-standard features (features not handled
-  by Chromium or Electron) given to `window.open()`. Deprecated, and will now
-  always be the empty array `[]`.
+  by Chromium or Electron) given to `window.open()`.
 * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
   passed to the new window. May or may not result in the `Referer` header being
   sent, depending on the referrer policy.
@@ -203,11 +222,13 @@ Returns:
   * `frameName` String - Name given to the created window in the
      `window.open()` call.
   * `options` BrowserWindowConstructorOptions - The options used to create the
-    BrowserWindow. They are merged in increasing precedence: parsed options
-    from the `features` string from `window.open()`, security-related
-    webPreferences inherited from the parent, and options given by
+    BrowserWindow. They are merged in increasing precedence: options inherited
+    from the parent, parsed options from the `features` string from
+    `window.open()`, and options given by
     [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
     Unrecognized options are not filtered out.
+  * `additionalFeatures` String[] - The non-standard features (features not
+    handled Chromium or Electron) _Deprecated_
   * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
     passed to the new window. May or may not result in the `Referer` header
     being sent, depending on the referrer policy.
@@ -374,8 +395,6 @@ win.webContents.on('will-prevent-unload', (event) => {
 })
 ```
 
-**Note:** This will be emitted for `BrowserViews` but will _not_ be respected - this is because we have chosen not to tie the `BrowserView` lifecycle to its owning BrowserWindow should one exist per the [specification](https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event).
-
 #### Event: 'crashed' _Deprecated_
 
 Returns:
@@ -711,6 +730,8 @@ first available device will be selected. `callback` should be called with
 `deviceId` to be selected, passing empty string to `callback` will
 cancel the request.
 
+If no event listener is added for this event, all bluetooth requests will be cancelled.
+
 ```javascript
 const { app, BrowserWindow } = require('electron')
 
@@ -840,6 +861,59 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process.
 Calling `event.preventDefault()` will make it return empty sources.
 
+#### Event: 'remote-require' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `moduleName` String
+
+Emitted when `remote.require()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-global' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `globalName` String
+
+Emitted when `remote.getGlobal()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the global from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-builtin' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `moduleName` String
+
+Emitted when `remote.getBuiltin()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-current-window' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+
+Emitted when `remote.getCurrentWindow()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-current-web-contents' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+
+Emitted when `remote.getCurrentWebContents()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 #### Event: 'preferred-size-changed'
 
 Returns:
@@ -1148,11 +1222,8 @@ Ignore application menu shortcuts while this web contents is focused.
   without a recognized 'action' value will result in a console error and have
   the same effect as returning `{action: 'deny'}`.
 
-Called before creating a window a new window is requested by the renderer, e.g.
-by `window.open()`, a link with `target="_blank"`, shift+clicking on a link, or
-submitting a form with `<form target="_blank">`. See
-[`window.open()`](window-open.md) for more details and how to use this in
-conjunction with `did-create-window`.
+Called before creating a window when `window.open()` is called from the
+renderer. See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `did-create-window`.
 
 #### `contents.setAudioMuted(muted)`
 

docs/api/web-frame-main.md

@@ -182,9 +182,3 @@ This is not the same as the OS process ID; to read that use `frame.osProcessId`.
 An `Integer` representing the unique frame id in the current renderer process.
 Distinct `WebFrameMain` instances that refer to the same underlying frame will
 have the same `routingId`.
-
-#### `frame.visibilityState` _Readonly_
-
-A `string` representing the [visibility state](https://developer.mozilla.org/en-US/docs/Web/API/Document/visibilityState) of the frame.
-
-See also how the [Page Visibility API](browser-window.md#page-visibility) is affected by other Electron APIs.

docs/api/web-request.md

@@ -53,7 +53,7 @@ The following methods are available on instances of `WebRequest`:
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `uploadData` [UploadData[]](structures/upload-data.md)
@@ -98,7 +98,7 @@ Some examples of valid `urls`:
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `requestHeaders` Record<string, string>
@@ -127,7 +127,7 @@ The `callback` has to be called with a `response` object.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `requestHeaders` Record<string, string>
@@ -149,7 +149,7 @@ response are visible by the time this listener is fired.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `statusLine` String
@@ -182,7 +182,7 @@ The `callback` has to be called with a `response` object.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `responseHeaders` Record<string, string[]> (optional)
@@ -208,7 +208,7 @@ and response headers are available.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `redirectURL` String
@@ -235,7 +235,7 @@ redirect is about to occur.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `responseHeaders` Record<string, string[]> (optional)
@@ -260,7 +260,7 @@ completed.
     * `webContentsId` Integer (optional)
     * `webContents` WebContents (optional)
     * `frame` WebFrameMain (optional)
-    * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+    * `resourceType` String
     * `referrer` String
     * `timestamp` Double
     * `fromCache` Boolean

docs/api/webview-tag.md

@@ -130,6 +130,15 @@ inside the `webview`. All your preloads will load for every iframe, you can
 use `process.isMainFrame` to determine if you are in the main frame or not.
 This option is disabled by default in the guest page.
 
+### `enableremotemodule`
+
+```html
+<webview src="http://www.google.com/" enableremotemodule="false"></webview>
+```
+
+A `Boolean`. When this attribute is `false` the guest page in `webview` will not have access
+to the [`remote`](remote.md) module. The remote module is unavailable by default.
+
 ### `plugins`
 
 ```html
@@ -142,12 +151,16 @@ browser plugins. Plugins are disabled by default.
 ### `preload`
 
 ```html
+<!-- from a file -->
 <webview src="https://www.github.com/" preload="./test.js"></webview>
+<!-- or if you want to load from an asar archive -->
+<webview src="https://www.github.com/" preload="./app.asar/test.js"></webview>
 ```
 
 A `String` that specifies a script that will be loaded before other scripts run in the guest
-page. The protocol of script's URL must be either `file:` or `asar:`, because it
-will be loaded by `require` in guest page under the hood.
+page. The protocol of script's URL must be `file:` (even when using `asar:` archives) because
+it will be loaded by Node's `require` under the hood, which treats `asar:` archives as virtual
+directories.
 
 When the guest page doesn't have node integration this script will still have
 access to all Node APIs, but global objects injected by Node will be deleted
@@ -991,3 +1004,78 @@ Emitted when DevTools is focused / opened.
 
 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
 [chrome-webview]: https://developer.chrome.com/docs/extensions/reference/webviewTag/
+
+### Event: 'context-menu'
+
+Returns:
+
+* `params` Object
+  * `x` Integer - x coordinate.
+  * `y` Integer - y coordinate.
+  * `linkURL` String - URL of the link that encloses the node the context menu
+    was invoked on.
+  * `linkText` String - Text associated with the link. May be an empty
+    string if the contents of the link are an image.
+  * `pageURL` String - URL of the top level page that the context menu was
+    invoked on.
+  * `frameURL` String - URL of the subframe that the context menu was invoked
+    on.
+  * `srcURL` String - Source URL for the element that the context menu
+    was invoked on. Elements with source URLs are images, audio and video.
+  * `mediaType` String - Type of the node the context menu was invoked on. Can
+    be `none`, `image`, `audio`, `video`, `canvas`, `file` or `plugin`.
+  * `hasImageContents` Boolean - Whether the context menu was invoked on an image
+    which has non-empty contents.
+  * `isEditable` Boolean - Whether the context is editable.
+  * `selectionText` String - Text of the selection that the context menu was
+    invoked on.
+  * `titleText` String - Title text of the selection that the context menu was
+    invoked on.
+  * `altText` String - Alt text of the selection that the context menu was
+    invoked on.
+  * `suggestedFilename` String - Suggested filename to be used when saving file through 'Save
+    Link As' option of context menu.
+  * `selectionRect` [Rectangle](structures/rectangle.md) - Rect representing the coordinates in the document space of the selection.
+  * `selectionStartOffset` Number - Start position of the selection text.
+  * `referrerPolicy` [Referrer](structures/referrer.md) - The referrer policy of the frame on which the menu is invoked.
+  * `misspelledWord` String - The misspelled word under the cursor, if any.
+  * `dictionarySuggestions` String[] - An array of suggested words to show the
+    user to replace the `misspelledWord`.  Only available if there is a misspelled
+    word and spellchecker is enabled.
+  * `frameCharset` String - The character encoding of the frame on which the
+    menu was invoked.
+  * `inputFieldType` String - If the context menu was invoked on an input
+    field, the type of that field. Possible values are `none`, `plainText`,
+    `password`, `other`.
+  * `spellcheckEnabled` Boolean - If the context is editable, whether or not spellchecking is enabled.
+  * `menuSourceType` String - Input source that invoked the context menu.
+    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
+  * `mediaFlags` Object - The flags for the media element the context menu was
+    invoked on.
+    * `inError` Boolean - Whether the media element has crashed.
+    * `isPaused` Boolean - Whether the media element is paused.
+    * `isMuted` Boolean - Whether the media element is muted.
+    * `hasAudio` Boolean - Whether the media element has audio.
+    * `isLooping` Boolean - Whether the media element is looping.
+    * `isControlsVisible` Boolean - Whether the media element's controls are
+      visible.
+    * `canToggleControls` Boolean - Whether the media element's controls are
+      toggleable.
+    * `canPrint` Boolean - Whether the media element can be printed.
+    * `canSave` Boolean - Whether or not the media element can be downloaded.
+    * `canShowPictureInPicture` Boolean - Whether the media element can show picture-in-picture.
+    * `isShowingPictureInPicture` Boolean - Whether the media element is currently showing picture-in-picture.
+    * `canRotate` Boolean - Whether the media element can be rotated.
+    * `canLoop` Boolean - Whether the media element can be looped.
+  * `editFlags` Object - These flags indicate whether the renderer believes it
+    is able to perform the corresponding action.
+    * `canUndo` Boolean - Whether the renderer believes it can undo.
+    * `canRedo` Boolean - Whether the renderer believes it can redo.
+    * `canCut` Boolean - Whether the renderer believes it can cut.
+    * `canCopy` Boolean - Whether the renderer believes it can copy.
+    * `canPaste` Boolean - Whether the renderer believes it can paste.
+    * `canDelete` Boolean - Whether the renderer believes it can delete.
+    * `canSelectAll` Boolean - Whether the renderer believes it can select all.
+    * `canEditRichly` Boolean - Whether the renderer believes it can edit text richly.
+
+Emitted when there is a new context menu that needs to be handled.

docs/api/window-open.md

@@ -23,8 +23,9 @@ BrowserWindow in the main process by using `webContents.setWindowOpenHandler()`
 for renderer-created windows.
 
 BrowserWindow constructor options are set by, in increasing precedence
-order: parsed options from the `features` string from `window.open()`,
-security-related webPreferences inherited from the parent, and options given by
+order: options inherited from the parent, parsed options
+from the `features` string from `window.open()`, security-related webPreferences
+inherited from the parent, and options given by
 [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
 Note that `webContents.setWindowOpenHandler` has final say and full privilege
 because it is invoked in the main process.
@@ -63,8 +64,7 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
   the parent window.
 * Non-standard features (that are not handled by Chromium or Electron) given in
   `features` will be passed to any registered `webContents`'s
-  `did-create-window` event handler in the `options` argument.
-* `frameName` follows the specification of `windowName` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
+  `did-create-window` event handler in the `additionalFeatures` argument.
 
 To customize or cancel the creation of the window, you can optionally set an
 override handler with `webContents.setWindowOpenHandler()` from the main
@@ -90,7 +90,7 @@ mainWindow.webContents.setWindowOpenHandler(({ url }) => {
 
 mainWindow.webContents.on('did-create-window', (childWindow) => {
   // For example...
-  childWindow.webContents.on('will-navigate', (e) => {
+  childWindow.webContents('will-navigate', (e) => {
     e.preventDefault()
   })
 })

docs/breaking-changes.md

@@ -12,36 +12,9 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
-## Planned Breaking API Changes (15.0)
-
-### Default Changed: `nativeWindowOpen` defaults to `true`
-
-Prior to Electron 15, `window.open` was by default shimmed to use
-`BrowserWindowProxy`. This meant that `window.open('about:blank')` did not work
-to open synchronously scriptable child windows, among other incompatibilities.
-`nativeWindowOpen: true` is no longer experimental, and is now the default.
-
-See the documentation for [window.open in Electron](api/window-open.md)
-for more details.
-
 ## Planned Breaking API Changes (14.0)
 
-### Removed: `app.allowRendererProcessReuse`
-
-The `app.allowRendererProcessReuse` property will be removed as part of our plan to
-more closely align with Chromium's process model for security, performance and maintainability.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### Removed: Browser Window Affinity
-
-The `affinity` option when constructing a new `BrowserWindow` will be removed
-as part of our plan to more closely align with Chromium's process model for security,
-performance and maintainability.
-
-For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
-
-### API Changed: `window.open()`
+### API Changed: `window.(open)`
 
 The optional parameter `frameName` will no longer set the title of the window. This now follows the specification described by the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters) under the corresponding parameter `windowName`.
 
@@ -55,53 +28,6 @@ ensure your code works with this property enabled.  It has been enabled by defau
 
 You will be affected by this change if you use either `webFrame.executeJavaScript` or `webFrame.executeJavaScriptInIsolatedWorld`. You will need to ensure that values returned by either of those methods are supported by the [Context Bridge API](api/context-bridge.md#parameter--error--return-type-support) as these methods use the same value passing semantics.
 
-### Removed: BrowserWindowConstructorOptions inheriting from parent windows
-
-Prior to Electron 14, windows opened with `window.open` would inherit
-BrowserWindow constructor options such as `transparent` and `resizable` from
-their parent window. Beginning with Electron 14, this behavior is removed, and
-windows will not inherit any BrowserWindow constructor options from their
-parents.
-
-Instead, explicitly set options for the new window with `setWindowOpenHandler`:
-
-```js
-webContents.setWindowOpenHandler((details) => {
-  return {
-    action: 'allow',
-    overrideBrowserWindowOptions: {
-      // ...
-    }
-  }
-})
-```
-
-### Removed: `additionalFeatures`
-
-The deprecated `additionalFeatures` property in the `new-window` and
-`did-create-window` events of WebContents has been removed. Since `new-window`
-uses positional arguments, the argument is still present, but will always be
-the empty array `[]`. (Though note, the `new-window` event itself is
-deprecated, and is replaced by `setWindowOpenHandler`.) Bare keys in window
-features will now present as keys with the value `true` in the options object.
-
-```js
-// Removed in Electron 14
-// Triggered by window.open('...', '', 'my-key')
-webContents.on('did-create-window', (window, details) => {
-  if (details.additionalFeatures.includes('my-key')) {
-    // ...
-  }
-})
-
-// Replace with
-webContents.on('did-create-window', (window, details) => {
-  if (details.options['my-key']) {
-    // ...
-  }
-})
-```
-
 ## Planned Breaking API Changes (13.0)
 
 ### API Changed: `session.setPermissionCheckHandler(handler)`
@@ -388,6 +314,14 @@ Setting `{ compress: false }` in `crashReporter.start` is deprecated. Nearly
 all crash ingestion servers support gzip compression. This option will be
 removed in a future version of Electron.
 
+### Removed: Browser Window Affinity
+
+The `affinity` option when constructing a new `BrowserWindow` will be removed
+as part of our plan to more closely align with Chromium's process model for security,
+performance and maintainability.
+
+For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).
+
 ### Default Changed: `enableRemoteModule` defaults to `false`
 
 In Electron 9, using the remote module without explicitly enabling it via the

docs/development/debugging-instructions-macos.md

@@ -26,7 +26,9 @@ you prefer a graphical interface.
 * **.lldbinit**: Create or edit `~/.lldbinit` to allow Chromium code to be properly source-mapped.
 
    ```text
-   command script import ~/electron/src/tools/lldb/lldbinit.py
+   # e.g: ['~/electron/src/tools/lldb']
+   script sys.path[:0] = ['<...path/to/electron/src/tools/lldb>']
+   script import lldbinit
    ```
 
 ## Attaching to and Debugging Electron

docs/development/pull-requests.md

@@ -106,6 +106,7 @@ Common prefixes:
 * perf: A code change that improves performance
 * refactor: A code change that neither fixes a bug nor adds a feature
 * style: Changes that do not affect the meaning of the code (linting)
+* vendor: Bumping a dependency like libchromiumcontent or node
 
 Other things to keep in mind when writing a commit message:
 

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

@@ -83,6 +83,8 @@ Electron
 * **.github** - GitHub-specific config files including issues templates and CODEOWNERS.
 * **dist** - Temporary directory created by `script/create-dist.py` script
   when creating a distribution.
+* **external_binaries** - Downloaded binaries of third-party frameworks which
+  do not support building with `gn`.
 * **node_modules** - Third party node modules used for building.
 * **npm** - Logic for installation of Electron via npm.
 * **out** - Temporary output directory of `ninja`.
@@ -99,3 +101,4 @@ script/ - The set of all scripts Electron runs for a variety of purposes.
 ```
 
 * **typings** - TypeScript typings for Electron's internal code.
+* **vendor** - Source code for some third party dependencies.

docs/tutorial/application-debugging.md

@@ -45,4 +45,4 @@ If the V8 context crashes, the DevTools will display this message.
 
 Chromium logs can be enabled via the `ELECTRON_ENABLE_LOGGING` environment variable. For more information, see the [environment variables documentation](../api/environment-variables.md#electron_enable_logging).
 
-Alternatively, the command line argument `--enable-logging` can be passed. More information is available in the [command line switches documentation](../api/command-line-switches.md#--enable-loggingfile).
+Alternatively, the command line argument `--enable-logging` can be passed. More information is available in the [command line switches documentation](../api/command-line-switches.md#--enable-logging).

docs/tutorial/code-signing.md

@@ -88,14 +88,15 @@ without meaning any harm:
   <dict>
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
     <key>com.apple.security.cs.debugger</key>
     <true/>
   </dict>
 </plist>
 ```
 
+Note that up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
+as well. However, it should not be used anymore if it can be avoided.
+
 To see all of this in action, check out Electron Fiddle's source code,
 [especially its `electron-forge` configuration
 file](https://github.com/electron/fiddle/blob/master/forge.config.js).
@@ -165,14 +166,15 @@ without meaning any harm:
   <dict>
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
     <key>com.apple.security.cs.debugger</key>
     <true/>
   </dict>
 </plist>
 ```
 
+Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
+as well. However, it should not be used anymore if it can be avoided.
+
 ## Mac App Store
 
 See the [Mac App Store Guide].
@@ -190,6 +192,7 @@ it may be worth your time to shop around. Popular resellers include:
 
 * [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
 * [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+* [GoDaddy](https://au.godaddy.com/web-security/code-signing-certificate)
 * Amongst others, please shop around to find one that suits your needs, Google
   is your friend 😄
 

docs/tutorial/dark-mode.md

@@ -80,9 +80,9 @@ Starting with the `index.html` file:
 </html>
 ```
 
-And the `styles.css` file:
+And the `style.css` file:
 
-```css title='styles.css'
+```css title='style.css'
 @media (prefers-color-scheme: dark) {
   body { background: #333; color: white; }
 }

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

@@ -1,5 +1,5 @@
 ---
-title: Launching Your Electron App From A URL In Another App
+title: launch-app-from-URL-in-another-app
 description: This guide will take you through the process of setting your electron app as the default handler for a specific protocol.
 slug: launch-app-from-url-in-another-app
 hide_title: true

docs/tutorial/process-model.md

@@ -148,7 +148,9 @@ A preload script can be attached to the main process in the `BrowserWindow` cons
 const { BrowserWindow } = require('electron')
 //...
 const win = new BrowserWindow({
-  preload: 'path/to/preload.js'
+  webPreferences: {
+    preload: 'path/to/preload.js'
+  }
 })
 //...
 ```

docs/tutorial/security.md

@@ -44,7 +44,7 @@ Chromium shared library and Node.js. Vulnerabilities affecting these components
 may impact the security of your application. By updating Electron to the latest
 version, you ensure that critical vulnerabilities (such as *nodeIntegration bypasses*)
 are already patched and cannot be exploited in your application. For more information,
-see "[Use a current version of Electron](#16-use-a-current-version-of-electron)".
+see "[Use a current version of Electron](#15-use-a-current-version-of-electron)".
 
 * **Evaluate your dependencies.** While NPM provides half a million reusable packages,
 it is your responsibility to choose trusted 3rd-party libraries. If you use outdated
@@ -88,19 +88,18 @@ You should at least follow these steps to improve the security of your applicati
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
 3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
-4. [Enable sandboxing](#4-enable-sandboxing)
-5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
-6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
-7. [Define a `Content-Security-Policy`](#7-define-a-content-security-policy) and use restrictive rules (i.e. `script-src 'self'`)
-8. [Do not set `allowRunningInsecureContent` to `true`](#8-do-not-set-allowrunninginsecurecontent-to-true)
-9. [Do not enable experimental features](#9-do-not-enable-experimental-features)
-10. [Do not use `enableBlinkFeatures`](#10-do-not-use-enableblinkfeatures)
-11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups)
-12. [`<webview>`: Verify options and params](#12-verify-webview-options-before-creation)
-13. [Disable or limit navigation](#13-disable-or-limit-navigation)
-14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
-15. [Do not use `openExternal` with untrusted content](#15-do-not-use-openexternal-with-untrusted-content)
-16. [Use a current version of Electron](#16-use-a-current-version-of-electron)
+4. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#4-handle-session-permission-requests-from-remote-content)
+5. [Do not disable `webSecurity`](#5-do-not-disable-websecurity)
+6. [Define a `Content-Security-Policy`](#6-define-a-content-security-policy) and use restrictive rules (i.e. `script-src 'self'`)
+7. [Do not set `allowRunningInsecureContent` to `true`](#7-do-not-set-allowrunninginsecurecontent-to-true)
+8. [Do not enable experimental features](#8-do-not-enable-experimental-features)
+9. [Do not use `enableBlinkFeatures`](#9-do-not-use-enableblinkfeatures)
+10. [`<webview>`: Do not use `allowpopups`](#10-do-not-use-allowpopups)
+11. [`<webview>`: Verify options and params](#11-verify-webview-options-before-creation)
+12. [Disable or limit navigation](#12-disable-or-limit-navigation)
+13. [Disable or limit creation of new windows](#13-disable-or-limit-creation-of-new-windows)
+14. [Do not use `openExternal` with untrusted content](#14-do-not-use-openexternal-with-untrusted-content)
+15. [Use a current version of Electron](#15-use-a-current-version-of-electron)
 
 To automate the detection of misconfigurations and insecure patterns, it is
 possible to use
@@ -240,26 +239,7 @@ and prevent the use of Node primitives `contextIsolation` **must** also be used.
 For more information on what `contextIsolation` is and how to enable it please
 see our dedicated [Context Isolation](context-isolation.md) document.
 
-## 4) Enable Sandboxing
-
-[Sandboxing](sandbox.md) is a Chromium feature that uses the operating system to
-significantly limit what renderer processes have access to. You should enable
-the sandbox in all renderers. Loading, reading or processing any untrusted
-content in an unsandboxed process, including the main process, is not advised.
-
-### How?
-
-When creating a window, pass the `sandbox: true` option in `webPreferences`:
-
-```js
-const win = new BrowserWindow({
-  webPreferences: {
-    sandbox: true
-  }
-})
-```
-
-## 5) Handle Session Permission Requests From Remote Content
+## 4) Handle Session Permission Requests From Remote Content
 
 You may have seen permission requests while using Chrome: They pop up whenever
 the website attempts to use a feature that the user has to manually approve (
@@ -297,7 +277,7 @@ session
   })
 ```
 
-## 6) Do Not Disable WebSecurity
+## 5) Do Not Disable WebSecurity
 
 _Recommendation is Electron's default_
 
@@ -338,7 +318,7 @@ const mainWindow = new BrowserWindow()
 <webview src="page.html"></webview>
 ```
 
-## 7) Define a Content Security Policy
+## 6) Define a Content Security Policy
 
 A Content Security Policy (CSP) is an additional layer of protection against
 cross-site-scripting attacks and data injection attacks. We recommend that they
@@ -394,7 +374,7 @@ on a page directly in the markup using a `<meta>` tag:
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'">
 ```
 
-## 8) Do Not Set `allowRunningInsecureContent` to `true`
+## 7) Do Not Set `allowRunningInsecureContent` to `true`
 
 _Recommendation is Electron's default_
 
@@ -427,7 +407,7 @@ const mainWindow = new BrowserWindow({
 const mainWindow = new BrowserWindow({})
 ```
 
-## 9) Do Not Enable Experimental Features
+## 8) Do Not Enable Experimental Features
 
 _Recommendation is Electron's default_
 
@@ -459,7 +439,7 @@ const mainWindow = new BrowserWindow({
 const mainWindow = new BrowserWindow({})
 ```
 
-## 10) Do Not Use `enableBlinkFeatures`
+## 9) Do Not Use `enableBlinkFeatures`
 
 _Recommendation is Electron's default_
 
@@ -491,7 +471,7 @@ const mainWindow = new BrowserWindow({
 const mainWindow = new BrowserWindow()
 ```
 
-## 11) Do Not Use `allowpopups`
+## 10) Do Not Use `allowpopups`
 
 _Recommendation is Electron's default_
 
@@ -518,7 +498,7 @@ you know it needs that feature.
 <webview src="page.html"></webview>
 ```
 
-## 12) Verify WebView Options Before Creation
+## 11) Verify WebView Options Before Creation
 
 A WebView created in a renderer process that does not have Node.js integration
 enabled will not be able to enable integration itself. However, a WebView will
@@ -565,7 +545,7 @@ app.on('web-contents-created', (event, contents) => {
 Again, this list merely minimizes the risk, it does not remove it. If your goal
 is to display a website, a browser will be a more secure option.
 
-## 13) Disable or limit navigation
+## 12) Disable or limit navigation
 
 If your app has no need to navigate or only needs to navigate to known pages,
 it is a good idea to limit navigation outright to that known scope, disallowing
@@ -609,7 +589,7 @@ app.on('web-contents-created', (event, contents) => {
 })
 ```
 
-## 14) Disable or limit creation of new windows
+## 13) Disable or limit creation of new windows
 
 If you have a known set of windows, it's a good idea to limit the creation of
 additional windows in your app.
@@ -656,7 +636,7 @@ app.on('web-contents-created', (event, contents) => {
 })
 ```
 
-## 15) Do not use `openExternal` with untrusted content
+## 14) Do not use `openExternal` with untrusted content
 
 Shell's [`openExternal`][open-external] allows opening a given protocol URI with
 the desktop's native utilities. On macOS, for instance, this function is similar
@@ -683,7 +663,7 @@ const { shell } = require('electron')
 shell.openExternal('https://example.com/index.html')
 ```
 
-## 16) Use a current version of Electron
+## 15) Use a current version of Electron
 
 You should strive for always using the latest available version of Electron.
 Whenever a new major version is released, you should attempt to update your

docs/tutorial/using-native-node-modules.md

@@ -90,7 +90,7 @@ match a public release, instruct `npm` to use the version of Node you have bundl
 with your custom build.
 
 ```sh
-npm rebuild --nodedir=/path/to/src/out/Default/gen/node_headers
+npm rebuild --nodedir=/path/to/electron/vendor/node
 ```
 
 ## Troubleshooting

electron_strings.grdp

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
+  <!-- Windows Caption Buttons -->
+  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
+    Close
+  </message>
+  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
+    Minimize
+  </message>
+  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
+    Maximize
+  </message>
+  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
+    Restore
+  </message>
+
   <!-- Printing Service -->
   <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
     Printing Service

filenames.auto.gni

@@ -42,6 +42,7 @@ auto_filenames = {
     "docs/api/power-save-blocker.md",
     "docs/api/process.md",
     "docs/api/protocol.md",
+    "docs/api/remote.md",
     "docs/api/screen.md",
     "docs/api/service-workers.md",
     "docs/api/session.md",
@@ -100,6 +101,7 @@ auto_filenames = {
     "docs/api/structures/new-window-web-contents-event.md",
     "docs/api/structures/notification-action.md",
     "docs/api/structures/notification-response.md",
+    "docs/api/structures/overlay-options.md",
     "docs/api/structures/point.md",
     "docs/api/structures/post-body.md",
     "docs/api/structures/printer-info.md",
@@ -127,26 +129,33 @@ auto_filenames = {
     "docs/api/structures/upload-data.md",
     "docs/api/structures/upload-file.md",
     "docs/api/structures/upload-raw-data.md",
-    "docs/api/structures/user-default-types.md",
     "docs/api/structures/web-source.md",
   ]
 
   sandbox_bundle_deps = [
+    "lib/browser/api/module-names.ts",
+    "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
+    "lib/common/api/module-list.ts",
+    "lib/common/api/shell.ts",
     "lib/common/define-properties.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
     "lib/common/web-view-methods.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/inspector.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/renderer/security-warnings.ts",
     "lib/renderer/web-frame-init.ts",
     "lib/renderer/web-view/guest-view-internal.ts",
@@ -167,13 +176,9 @@ auto_filenames = {
   ]
 
   isolated_bundle_deps = [
-    "lib/common/type-utils.ts",
-    "lib/common/web-view-methods.ts",
     "lib/isolated_renderer/init.ts",
-    "lib/renderer/web-view/web-view-attributes.ts",
     "lib/renderer/web-view/web-view-constants.ts",
     "lib/renderer/web-view/web-view-element.ts",
-    "lib/renderer/web-view/web-view-impl.ts",
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
@@ -234,6 +239,9 @@ auto_filenames = {
     "lib/browser/ipc-main-internal-utils.ts",
     "lib/browser/ipc-main-internal.ts",
     "lib/browser/message-port-main.ts",
+    "lib/browser/navigation-controller.ts",
+    "lib/browser/remote/objects-registry.ts",
+    "lib/browser/remote/server.ts",
     "lib/browser/rpc-server.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
@@ -243,6 +251,7 @@ auto_filenames = {
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
     "lib/common/parse-features-string.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
@@ -258,6 +267,7 @@ auto_filenames = {
   ]
 
   renderer_bundle_deps = [
+    "lib/browser/api/module-names.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
@@ -265,10 +275,12 @@ auto_filenames = {
     "lib/common/define-properties.ts",
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
     "lib/common/web-view-methods.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
@@ -277,11 +289,13 @@ auto_filenames = {
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/init.ts",
     "lib/renderer/inspector.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/renderer/security-warnings.ts",
     "lib/renderer/web-frame-init.ts",
     "lib/renderer/web-view/guest-view-internal.ts",
@@ -299,6 +313,7 @@ auto_filenames = {
   ]
 
   worker_bundle_deps = [
+    "lib/browser/api/module-names.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
@@ -306,8 +321,10 @@ auto_filenames = {
     "lib/common/define-properties.ts",
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
@@ -316,9 +333,11 @@ auto_filenames = {
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/worker/init.ts",
     "package.json",
     "tsconfig.electron.json",

filenames.gni

@@ -90,6 +90,10 @@ filenames = {
     "shell/browser/ui/views/electron_views_delegate_win.cc",
     "shell/browser/ui/views/win_frame_view.cc",
     "shell/browser/ui/views/win_frame_view.h",
+    "shell/browser/ui/views/win_caption_button.cc",
+    "shell/browser/ui/views/win_caption_button.h",
+    "shell/browser/ui/views/win_caption_button_container.cc",
+    "shell/browser/ui/views/win_caption_button_container.h",
     "shell/browser/ui/win/dialog_thread.cc",
     "shell/browser/ui/win/dialog_thread.h",
     "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
@@ -510,7 +514,6 @@ filenames = {
     "shell/common/api/electron_api_native_image.cc",
     "shell/common/api/electron_api_native_image.h",
     "shell/common/api/electron_api_shell.cc",
-    "shell/common/api/electron_api_testing.cc",
     "shell/common/api/electron_api_v8_util.cc",
     "shell/common/api/electron_bindings.cc",
     "shell/common/api/electron_bindings.h",
@@ -605,8 +608,6 @@ filenames = {
     "shell/common/keyboard_util.cc",
     "shell/common/keyboard_util.h",
     "shell/common/language_util.h",
-    "shell/common/logging.cc",
-    "shell/common/logging.h",
     "shell/common/mouse_util.cc",
     "shell/common/mouse_util.h",
     "shell/common/node_bindings.cc",

filenames.libcxx.gni

@@ -13,46 +13,23 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional_base",
   "//buildtools/third_party/libc++/trunk/include/__functional_base_03",
   "//buildtools/third_party/libc++/trunk/include/__hash_table",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/incrementable_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/iter_move.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/iterator_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/readable_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
   "//buildtools/third_party/libc++/trunk/include/__locale",
-  "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/allocation_guard.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/auto_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/compressed_pair.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/construct_at.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/pointer_safety.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/base.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/pointer_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/raw_storage_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/shared_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/utilities.h",
   "//buildtools/third_party/libc++/trunk/include/__mutex_base",
   "//buildtools/third_party/libc++/trunk/include/__node_handle",
   "//buildtools/third_party/libc++/trunk/include/__nullptr",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/access.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/data.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/empty.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/size.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/view.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
+  "//buildtools/third_party/libc++/trunk/include/__sso_allocator",
   "//buildtools/third_party/libc++/trunk/include/__std_stream",
   "//buildtools/third_party/libc++/trunk/include/__string",
   "//buildtools/third_party/libc++/trunk/include/__support/android/locale_bionic.h",
   "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/gettod_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_aix.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
@@ -72,7 +49,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__tree",
   "//buildtools/third_party/libc++/trunk/include/__tuple",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
-  "//buildtools/third_party/libc++/trunk/include/__utility/to_underlying.h",
   "//buildtools/third_party/libc++/trunk/include/algorithm",
   "//buildtools/third_party/libc++/trunk/include/any",
   "//buildtools/third_party/libc++/trunk/include/array",
@@ -176,7 +152,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/ostream",
   "//buildtools/third_party/libc++/trunk/include/queue",
   "//buildtools/third_party/libc++/trunk/include/random",
-  "//buildtools/third_party/libc++/trunk/include/ranges",
   "//buildtools/third_party/libc++/trunk/include/ratio",
   "//buildtools/third_party/libc++/trunk/include/regex",
   "//buildtools/third_party/libc++/trunk/include/scoped_allocator",

lib/browser/api/app.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { Menu } from 'electron/main';
+import { deprecate, Menu } from 'electron/main';
 
 const bindings = process._linkedBinding('electron_browser_app');
 const commandLine = process._linkedBinding('electron_common_command_line');
@@ -66,6 +66,19 @@ Object.defineProperty(app, 'applicationMenu', {
 // The native implementation is not provided on non-windows platforms
 app.setAppUserModelId = app.setAppUserModelId || (() => {});
 
+app._setDefaultAppPaths = (packagePath) => {
+  // Set the user path according to application's name.
+  app.setPath('userData', path.join(app.getPath('appData'), app.name!));
+  app.setPath('userCache', path.join(app.getPath('cache'), app.name!));
+  app.setAppPath(packagePath);
+
+  // Add support for --user-data-dir=
+  if (app.commandLine.hasSwitch('user-data-dir')) {
+    const userDataDir = app.commandLine.getSwitchValue('user-data-dir');
+    if (path.isAbsolute(userDataDir)) app.setPath('userData', userDataDir);
+  }
+};
+
 if (process.platform === 'darwin') {
   const setDockMenu = app.dock!.setMenu;
   app.dock!.setMenu = (menu) => {
@@ -119,3 +132,7 @@ for (const name of events) {
     webContents.emit(name, event, ...args);
   });
 }
+
+// Deprecate allowRendererProcessReuse but only if they set it to false, no need to log if
+// they are setting it to true
+deprecate.removeProperty({ __proto__: app } as any, 'allowRendererProcessReuse', [false]);

lib/browser/api/base-window.ts

@@ -37,11 +37,6 @@ Object.defineProperty(BaseWindow.prototype, 'simpleFullScreen', {
   set: function (simple) { this.setSimpleFullScreen(simple); }
 });
 
-Object.defineProperty(BaseWindow.prototype, 'focusable', {
-  get: function () { return this.isFocusable(); },
-  set: function (focusable) { this.setFocusable(focusable); }
-});
-
 Object.defineProperty(BaseWindow.prototype, 'kiosk', {
   get: function () { return this.isKiosk(); },
   set: function (kiosk) { this.setKiosk(kiosk); }

lib/browser/api/crash-reporter.ts

@@ -18,7 +18,7 @@ class CrashReporter {
 
     if (uploadToServer && !submitURL) throw new Error('submitURL must be specified when uploadToServer is true');
 
-    if (!compress && uploadToServer) {
+    if (!compress) {
       deprecate.log('Sending uncompressed crash reports is deprecated and will be removed in a future version of Electron. Set { compress: true } to opt-in to the new behavior. Crash reports will be uploaded gzipped, which most crash reporting servers support.');
     }
 

lib/browser/api/dialog.ts

@@ -2,6 +2,11 @@ import { app, BrowserWindow } from 'electron/main';
 import type { OpenDialogOptions, OpenDialogReturnValue, MessageBoxOptions, SaveDialogOptions, SaveDialogReturnValue, MessageBoxReturnValue, CertificateTrustDialogOptions } from 'electron/main';
 const dialogBinding = process._linkedBinding('electron_browser_dialog');
 
+enum DialogType {
+  OPEN = 'OPEN',
+  SAVE = 'SAVE'
+}
+
 enum SaveFileDialogProperties {
   createDirectory = 1 << 0,
   showHiddenFiles = 1 << 1,
@@ -67,6 +72,16 @@ const setupSaveDialogProperties = (properties: (keyof typeof SaveFileDialogPrope
   return dialogProperties;
 };
 
+const setupDialogProperties = (type: DialogType, properties: string[]): number => {
+  if (type === DialogType.OPEN) {
+    return setupOpenDialogProperties(properties as (keyof typeof OpenFileDialogProperties)[]);
+  } else if (type === DialogType.SAVE) {
+    return setupSaveDialogProperties(properties as (keyof typeof SaveFileDialogProperties)[]);
+  } else {
+    return 0;
+  }
+};
+
 const saveDialog = (sync: boolean, window: BrowserWindow | null, options?: SaveDialogOptions) => {
   checkAppInitialized();
 
@@ -100,7 +115,7 @@ const saveDialog = (sync: boolean, window: BrowserWindow | null, options?: SaveD
     nameFieldLabel,
     showsTagField,
     window,
-    properties: setupSaveDialogProperties(properties)
+    properties: setupDialogProperties(DialogType.SAVE, properties)
   };
 
   return sync ? dialogBinding.showSaveDialogSync(settings) : dialogBinding.showSaveDialog(settings);
@@ -141,7 +156,7 @@ const openDialog = (sync: boolean, window: BrowserWindow | null, options?: OpenD
     message,
     securityScopedBookmarks,
     window,
-    properties: setupOpenDialogProperties(properties)
+    properties: setupDialogProperties(DialogType.OPEN, properties)
   };
 
   return (sync) ? dialogBinding.showOpenDialogSync(settings) : dialogBinding.showOpenDialog(settings);

lib/browser/api/module-names.ts

@@ -0,0 +1,50 @@
+// TODO: Figure out a way to not duplicate this information between here and module-list
+// It is currently duplicated as module-list "require"s all the browser API file and the
+// remote module in the renderer process depends on that file.  As a result webpack
+// includes all the browser API files in the renderer process as well and we want to avoid that
+
+// Browser side modules, please sort alphabetically.
+export const browserModuleNames = [
+  'app',
+  'autoUpdater',
+  'BaseWindow',
+  'BrowserView',
+  'BrowserWindow',
+  'contentTracing',
+  'crashReporter',
+  'dialog',
+  'globalShortcut',
+  'ipcMain',
+  'inAppPurchase',
+  'Menu',
+  'MenuItem',
+  'nativeImage',
+  'nativeTheme',
+  'net',
+  'netLog',
+  'MessageChannelMain',
+  'Notification',
+  'powerMonitor',
+  'powerSaveBlocker',
+  'protocol',
+  'screen',
+  'session',
+  'ShareMenu',
+  'systemPreferences',
+  'TouchBar',
+  'Tray',
+  'View',
+  'webContents',
+  'WebContentsView',
+  'webFrameMain'
+];
+
+if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
+  browserModuleNames.push('desktopCapturer');
+}
+
+if (BUILDFLAG(ENABLE_VIEWS_API)) {
+  browserModuleNames.push(
+    'ImageView'
+  );
+}

lib/browser/api/web-contents.ts

@@ -1,9 +1,10 @@
-import { app, ipcMain, session, webFrameMain } from 'electron/main';
+import { app, ipcMain, session, deprecate, webFrameMain } from 'electron/main';
 import type { BrowserWindowConstructorOptions, LoadURLOptions } from 'electron/main';
 
 import * as url from 'url';
 import * as path from 'path';
 import { openGuestWindow, makeWebPreferences, parseContentTypeFormat } from '@electron/internal/browser/guest-window-manager';
+import { NavigationController } from '@electron/internal/browser/navigation-controller';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
@@ -406,80 +407,6 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
   }));
 };
 
-WebContents.prototype.loadURL = function (url, options) {
-  if (!options) {
-    options = {};
-  }
-
-  const p = new Promise<void>((resolve, reject) => {
-    const resolveAndCleanup = () => {
-      removeListeners();
-      resolve();
-    };
-    const rejectAndCleanup = (errorCode: number, errorDescription: string, url: string) => {
-      const err = new Error(`${errorDescription} (${errorCode}) loading '${typeof url === 'string' ? url.substr(0, 2048) : url}'`);
-      Object.assign(err, { errno: errorCode, code: errorDescription, url });
-      removeListeners();
-      reject(err);
-    };
-    const finishListener = () => {
-      resolveAndCleanup();
-    };
-    const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
-      if (isMainFrame) {
-        rejectAndCleanup(errorCode, errorDescription, validatedURL);
-      }
-    };
-
-    let navigationStarted = false;
-    const navigationListener = (event: Electron.Event, url: string, isSameDocument: boolean, isMainFrame: boolean) => {
-      if (isMainFrame) {
-        if (navigationStarted && !isSameDocument) {
-          // the webcontents has started another unrelated navigation in the
-          // main frame (probably from the app calling `loadURL` again); reject
-          // the promise
-          // We should only consider the request aborted if the "navigation" is
-          // actually navigating and not simply transitioning URL state in the
-          // current context.  E.g. pushState and `location.hash` changes are
-          // considered navigation events but are triggered with isSameDocument.
-          // We can ignore these to allow virtual routing on page load as long
-          // as the routing does not leave the document
-          return rejectAndCleanup(-3, 'ERR_ABORTED', url);
-        }
-        navigationStarted = true;
-      }
-    };
-    const stopLoadingListener = () => {
-      // By the time we get here, either 'finish' or 'fail' should have fired
-      // if the navigation occurred. However, in some situations (e.g. when
-      // attempting to load a page with a bad scheme), loading will stop
-      // without emitting finish or fail. In this case, we reject the promise
-      // with a generic failure.
-      // TODO(jeremy): enumerate all the cases in which this can happen. If
-      // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
-      // would be more appropriate.
-      rejectAndCleanup(-2, 'ERR_FAILED', url);
-    };
-    const removeListeners = () => {
-      this.removeListener('did-finish-load', finishListener);
-      this.removeListener('did-fail-load', failListener);
-      this.removeListener('did-start-navigation', navigationListener);
-      this.removeListener('did-stop-loading', stopLoadingListener);
-      this.removeListener('destroyed', stopLoadingListener);
-    };
-    this.on('did-finish-load', finishListener);
-    this.on('did-fail-load', failListener);
-    this.on('did-start-navigation', navigationListener);
-    this.on('did-stop-loading', stopLoadingListener);
-    this.on('destroyed', stopLoadingListener);
-  });
-  // Add a no-op rejection handler to silence the unhandled rejection error.
-  p.catch(() => {});
-  this._loadURL(url, options);
-  this.emit('load-url', url, options);
-  return p;
-};
-
 WebContents.prototype.setWindowOpenHandler = function (handler: (details: Electron.HandlerDetails) => ({action: 'allow'} | {action: 'deny', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions})) {
   this._windowOpenHandler = handler;
 };
@@ -548,6 +475,24 @@ const loggingEnabled = () => {
 
 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
+  // The navigation controller.
+  const navigationController = new NavigationController(this);
+  this.loadURL = navigationController.loadURL.bind(navigationController);
+  this.getURL = navigationController.getURL.bind(navigationController);
+  this.stop = navigationController.stop.bind(navigationController);
+  this.reload = navigationController.reload.bind(navigationController);
+  this.reloadIgnoringCache = navigationController.reloadIgnoringCache.bind(navigationController);
+  this.canGoBack = navigationController.canGoBack.bind(navigationController);
+  this.canGoForward = navigationController.canGoForward.bind(navigationController);
+  this.canGoToIndex = navigationController.canGoToIndex.bind(navigationController);
+  this.canGoToOffset = navigationController.canGoToOffset.bind(navigationController);
+  this.clearHistory = navigationController.clearHistory.bind(navigationController);
+  this.goBack = navigationController.goBack.bind(navigationController);
+  this.goForward = navigationController.goForward.bind(navigationController);
+  this.goToIndex = navigationController.goToIndex.bind(navigationController);
+  this.goToOffset = navigationController.goToOffset.bind(navigationController);
+  this.getActiveIndex = navigationController.getActiveIndex.bind(navigationController);
+  this.length = navigationController.length.bind(navigationController);
   // Read off the ID at construction time, so that it's accessible even after
   // the underlying C++ WebContents is destroyed.
   const id = this.id;
@@ -558,6 +503,10 @@ WebContents.prototype._init = function () {
 
   this._windowOpenHandler = null;
 
+  // Every remote callback from renderer process would add a listener to the
+  // render-view-deleted event, so ignore the listeners warning.
+  this.setMaxListeners(0);
+
   // Dispatch IPC messages to the ipc module.
   this.on('-ipc-message' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, args: any[]) {
     addSenderFrameToEvent(event);
@@ -592,6 +541,9 @@ WebContents.prototype._init = function () {
       ipcMainInternal.emit(channel, event, ...args);
     } else {
       addReplyToEvent(event);
+      if (this.listenerCount('ipc-message-sync') === 0 && ipcMain.listenerCount(channel) === 0) {
+        console.warn(`WebContents #${this.id} called ipcRenderer.sendSync() with '${channel}' channel without listeners.`);
+      }
       this.emit('ipc-message-sync', event, channel, ...args);
       ipcMain.emit(channel, event, ...args);
     }
@@ -709,6 +661,11 @@ WebContents.prototype._init = function () {
         }
       });
     });
+
+    const prefs = this.getWebPreferences() || {};
+    if (prefs.webviewTag && prefs.contextIsolation) {
+      deprecate.log('Security Warning: A WebContents was just created with both webviewTag and contextIsolation enabled.  This combination is fundamentally less secure and effectively bypasses the protections of contextIsolation.  We strongly recommend you move away from webviews to OOPIF or BrowserView in order for your app to be more secure');
+    }
   }
 
   this.on('login', (event, ...args) => {
@@ -724,6 +681,14 @@ WebContents.prototype._init = function () {
     }
   });
 
+  this.on('select-bluetooth-device', (event, devices, callback) => {
+    if (this.listenerCount('select-bluetooth-device') === 0) {
+      // Cancel it if there are no handlers
+      event.preventDefault();
+      callback('');
+    }
+  });
+
   const event = process._linkedBinding('electron_browser_event').createEmpty();
   app.emit('web-contents-created', event, this);
 
@@ -769,6 +734,10 @@ export function fromId (id: string) {
   return binding.fromId(id);
 }
 
+export function fromDevToolsTargetId (targetId: string) {
+  return binding.fromDevToolsTargetId(targetId);
+}
+
 export function getFocusedWebContents () {
   let focused = null;
   for (const contents of binding.getAllWebContents()) {

lib/browser/desktop-capturer.ts

@@ -13,7 +13,7 @@ function isValid (options: Electron.SourcesOptions) {
   return Array.isArray(types);
 }
 
-export const getSourcesImpl = (sender: Electron.WebContents | null, args: Electron.SourcesOptions) => {
+export const getSourcesImpl = (event: Electron.IpcMainEvent | null, args: Electron.SourcesOptions) => {
   if (!isValid(args)) throw new Error('Invalid options');
 
   const captureWindow = args.types.includes('window');
@@ -48,8 +48,8 @@ export const getSourcesImpl = (sender: Electron.WebContents | null, args: Electr
       }
       // Remove from currentlyRunning once we resolve or reject
       currentlyRunning = currentlyRunning.filter(running => running.options !== options);
-      if (sender) {
-        sender.removeListener('destroyed', stopRunning);
+      if (event) {
+        event.sender.removeListener('destroyed', stopRunning);
       }
     };
 
@@ -68,8 +68,8 @@ export const getSourcesImpl = (sender: Electron.WebContents | null, args: Electr
     // If the WebContents is destroyed before receiving result, just remove the
     // reference to emit and the capturer itself so that it never dispatches
     // back to the renderer
-    if (sender) {
-      sender.once('destroyed', stopRunning);
+    if (event) {
+      event.sender.once('destroyed', stopRunning);
     }
   });
 

lib/browser/devtools.ts

@@ -54,7 +54,7 @@ const isChromeDevTools = function (pageURL: string) {
 };
 
 const assertChromeDevTools = function (contents: Electron.WebContents, api: string) {
-  const pageURL = contents.getURL();
+  const pageURL = contents._getURL();
   if (!isChromeDevTools(pageURL)) {
     console.error(`Blocked ${pageURL} from calling ${api}`);
     throw new Error(`Blocked ${api}`);

lib/browser/guest-view-manager.ts

@@ -34,12 +34,12 @@ const createGuest = function (embedder: Electron.WebContents, params: Record<str
   const guest = (webContents as typeof ElectronInternal.WebContents).create({
     type: 'webview',
     partition: params.partition,
-    embedder
+    embedder: embedder
   });
   const guestInstanceId = guest.id;
   guestInstances.set(guestInstanceId, {
-    guest,
-    embedder
+    guest: guest,
+    embedder: embedder
   });
 
   // Clear the guest from map when it is destroyed.
@@ -165,9 +165,10 @@ const attachGuest = function (event: Electron.IpcMainInvokeEvent,
       : null;
 
   const webPreferences: Electron.WebPreferences = {
-    guestInstanceId,
+    guestInstanceId: guestInstanceId,
     nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false,
     nodeIntegrationInSubFrames: params.nodeintegrationinsubframes != null ? params.nodeintegrationinsubframes : false,
+    enableRemoteModule: params.enableremotemodule,
     plugins: params.plugins,
     zoomFactor: embedder.zoomFactor,
     disablePopups: !params.allowpopups,
@@ -187,6 +188,7 @@ const attachGuest = function (event: Electron.IpcMainInvokeEvent,
     ['javascript', false],
     ['nativeWindowOpen', true],
     ['nodeIntegration', false],
+    ['enableRemoteModule', false],
     ['sandbox', true],
     ['nodeIntegrationInSubFrames', false],
     ['enableWebSQL', false]
@@ -216,7 +218,7 @@ const attachGuest = function (event: Electron.IpcMainInvokeEvent,
 
   watchEmbedder(embedder);
 
-  webViewManager.addGuest(guestInstanceId, embedder, guest, webPreferences);
+  webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences);
   guest.attachToIframe(embedder, embedderFrameId);
 };
 
@@ -319,8 +321,13 @@ handleMessageSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_DETACH_GUEST, function (event,
 });
 
 // this message is sent by the actual <webview>
-ipcMainInternal.on(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, function (event: ElectronInternal.IpcMainInternalEvent, focus: boolean) {
-  event.sender.emit('-focus-change', {}, focus);
+ipcMainInternal.on(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, function (event: ElectronInternal.IpcMainInternalEvent, focus: boolean, guestInstanceId: number) {
+  const guest = getGuest(guestInstanceId);
+  if (guest === event.sender) {
+    event.sender.emit('focus-change', {}, focus, guestInstanceId);
+  } else {
+    console.error(`focus-change for guestInstanceId: ${guestInstanceId}`);
+  }
 });
 
 handleMessage(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, function (event, guestInstanceId: number, method: string, args: any[]) {
@@ -367,12 +374,18 @@ handleMessage(IPC_MESSAGES.GUEST_VIEW_MANAGER_CAPTURE_PAGE, async function (even
 
 // Returns WebContents from its guest id hosted in given webContents.
 const getGuestForWebContents = function (guestInstanceId: number, contents: Electron.WebContents) {
-  const guestInstance = guestInstances.get(guestInstanceId);
-  if (!guestInstance) {
+  const guest = getGuest(guestInstanceId);
+  if (!guest) {
     throw new Error(`Invalid guestInstanceId: ${guestInstanceId}`);
   }
-  if (guestInstance.guest.hostWebContents !== contents) {
+  if (guest.hostWebContents !== contents) {
     throw new Error(`Access denied to guestInstanceId: ${guestInstanceId}`);
   }
-  return guestInstance.guest;
+  return guest;
+};
+
+// Returns WebContents from its guest id.
+const getGuest = function (guestInstanceId: number) {
+  const guestInstance = guestInstances.get(guestInstanceId);
+  if (guestInstance != null) return guestInstance.guest;
 };

lib/browser/guest-window-manager.ts

@@ -42,7 +42,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
   windowOpenArgs: WindowOpenArgs,
 }): BrowserWindow | undefined {
   const { url, frameName, features } = windowOpenArgs;
-  const { options: browserWindowOptions } = makeBrowserWindowOptions({
+  const { options: browserWindowOptions, additionalFeatures } = makeBrowserWindowOptions({
     embedder,
     features,
     overrideOptions: overrideBrowserWindowOptions
@@ -54,6 +54,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
     guest,
     browserWindowOptions,
     windowOpenArgs,
+    additionalFeatures,
     disposition,
     postData,
     referrer
@@ -92,7 +93,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
 
   handleWindowLifecycleEvents({ embedder, frameName, guest: window });
 
-  embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, referrer, postData });
+  embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, additionalFeatures, referrer, postData });
 
   return window;
 }
@@ -133,12 +134,13 @@ const handleWindowLifecycleEvents = function ({ embedder, guest, frameName }: {
  * Deprecated in favor of `webContents.setWindowOpenHandler` and
  * `did-create-window` in 11.0.0. Will be removed in 12.0.0.
  */
-function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs, browserWindowOptions, disposition, referrer, postData }: {
+function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs, browserWindowOptions, additionalFeatures, disposition, referrer, postData }: {
   event: { sender: WebContents, defaultPrevented: boolean, newGuest?: BrowserWindow },
   embedder: WebContents,
   guest?: WebContents,
   windowOpenArgs: WindowOpenArgs,
   browserWindowOptions: BrowserWindowConstructorOptions,
+  additionalFeatures: string[]
   disposition: string,
   referrer: Referrer,
   postData?: PostData,
@@ -160,7 +162,7 @@ function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs,
       ...browserWindowOptions,
       webContents: guest
     },
-    [], // additionalFeatures
+    additionalFeatures,
     referrer,
     postBody
   );
@@ -192,43 +194,49 @@ const securityWebPreferences: { [key: string]: boolean } = {
   javascript: false,
   nativeWindowOpen: true,
   nodeIntegration: false,
+  enableRemoteModule: false,
   sandbox: true,
   webviewTag: false,
   nodeIntegrationInSubFrames: false,
   enableWebSQL: false
 };
 
-function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
+function makeBrowserWindowOptions ({ embedder, features, overrideOptions, useDeprecatedBehaviorForBareValues = true, useDeprecatedBehaviorForOptionInheritance = true }: {
   embedder: WebContents,
   features: string,
   overrideOptions?: BrowserWindowConstructorOptions,
+  useDeprecatedBehaviorForBareValues?: boolean
+  useDeprecatedBehaviorForOptionInheritance?: boolean
 }) {
-  const { options: parsedOptions, webPreferences: parsedWebPreferences } = parseFeatures(features);
+  const { options: parsedOptions, webPreferences: parsedWebPreferences, additionalFeatures } = parseFeatures(features, useDeprecatedBehaviorForBareValues);
+
+  const deprecatedInheritedOptions = getDeprecatedInheritedOptions(embedder);
 
   return {
+    additionalFeatures,
     options: {
+      ...(useDeprecatedBehaviorForOptionInheritance && deprecatedInheritedOptions),
       show: true,
       width: 800,
       height: 600,
       ...parsedOptions,
       ...overrideOptions,
-      webPreferences: makeWebPreferences({
-        embedder,
-        insecureParsedWebPreferences: parsedWebPreferences,
-        secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
-      })
+      webPreferences: makeWebPreferences({ embedder, insecureParsedWebPreferences: parsedWebPreferences, secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences, useDeprecatedBehaviorForOptionInheritance: true })
     } as Electron.BrowserViewConstructorOptions
   };
 }
 
-export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {} }: {
+export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {}, useDeprecatedBehaviorForOptionInheritance = true }: {
   embedder: WebContents,
   insecureParsedWebPreferences?: ReturnType<typeof parseFeatures>['webPreferences'],
   // Note that override preferences are considered elevated, and should only be
   // sourced from the main process, as they override security defaults. If you
   // have unvetted prefs, use parsedWebPreferences.
   secureOverrideWebPreferences?: BrowserWindowConstructorOptions['webPreferences'],
+  useDeprecatedBehaviorForBareValues?: boolean
+  useDeprecatedBehaviorForOptionInheritance?: boolean
 }) {
+  const deprecatedInheritedOptions = getDeprecatedInheritedOptions(embedder);
   const parentWebPreferences = embedder.getLastWebPreferences();
   const securityWebPreferencesFromParent = (Object.keys(securityWebPreferences).reduce((map, key) => {
     if (securityWebPreferences[key] === parentWebPreferences[key as keyof Electron.WebPreferences]) {
@@ -239,6 +247,7 @@ export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {
   const openerId = parentWebPreferences.nativeWindowOpen ? null : embedder.id;
 
   return {
+    ...(useDeprecatedBehaviorForOptionInheritance && deprecatedInheritedOptions ? deprecatedInheritedOptions.webPreferences : null),
     ...parsedWebPreferences,
     // Note that order is key here, we want to disallow the renderer's
     // ability to change important security options but allow main (via
@@ -251,6 +260,25 @@ export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {
   };
 }
 
+/**
+ * Current Electron behavior is to inherit all options from the parent window.
+ * In practical use, this is kind of annoying because consumers have to know
+ * about the parent window's preferences in order to unset them and makes child
+ * windows even more of an anomaly. In 11.0.0 we will remove this behavior and
+ * only critical security preferences will be inherited by default.
+ */
+function getDeprecatedInheritedOptions (embedder: WebContents) {
+  if (!embedder.browserWindowOptions) {
+    // If it's a webview, return just the webPreferences.
+    return {
+      webPreferences: embedder.getLastWebPreferences()
+    };
+  }
+
+  const { type, show, ...inheritableOptions } = embedder.browserWindowOptions;
+  return inheritableOptions;
+}
+
 function formatPostDataHeaders (postData: PostData) {
   if (!postData) return;
 

lib/browser/guest-window-proxy.ts

@@ -136,7 +136,7 @@ handleMessage(
 
     if (!windowMethods.has(method)) {
       console.error(
-        `Blocked ${event.senderFrame.url} from calling method: ${method}`
+        `Blocked ${event.sender.getURL()} from calling method: ${method}`
       );
       throw new Error(`Invalid method: ${method}`);
     }

lib/browser/init.ts

@@ -2,8 +2,6 @@ import { EventEmitter } from 'events';
 import * as fs from 'fs';
 import * as path from 'path';
 
-import type * as defaultMenuModule from '@electron/internal/browser/default-menu';
-
 const Module = require('module');
 
 // We modified the original process.argv to let node.js load the init.js,
@@ -129,11 +127,15 @@ if (packageJson.v8Flags != null) {
   require('v8').setFlagsFromString(packageJson.v8Flags);
 }
 
-app.setAppPath(packagePath);
+app._setDefaultAppPaths(packagePath);
 
 // Load the chrome devtools support.
 require('@electron/internal/browser/devtools');
 
+if (BUILDFLAG(ENABLE_REMOTE_MODULE)) {
+  require('@electron/internal/browser/remote/server');
+}
+
 // Load protocol module to ensure it is populated on app ready
 require('@electron/internal/browser/api/protocol');
 
@@ -174,7 +176,7 @@ app.on('window-all-closed', () => {
   }
 });
 
-const { setDefaultApplicationMenu } = require('@electron/internal/browser/default-menu') as typeof defaultMenuModule;
+const { setDefaultApplicationMenu } = require('@electron/internal/browser/default-menu');
 
 // Create default menu.
 //

lib/browser/navigation-controller.ts

@@ -0,0 +1,228 @@
+import type { WebContents, LoadURLOptions } from 'electron/main';
+import { EventEmitter } from 'events';
+
+// JavaScript implementation of Chromium's NavigationController.
+// Instead of relying on Chromium for history control, we completely do history
+// control on user land, and only rely on WebContents.loadURL for navigation.
+// This helps us avoid Chromium's various optimizations so we can ensure renderer
+// process is restarted every time.
+export class NavigationController extends EventEmitter {
+  currentIndex: number = -1;
+  inPageIndex: number = -1;
+  pendingIndex: number = -1;
+  history: string[] = [];
+
+  constructor (private webContents: WebContents) {
+    super();
+    this.clearHistory();
+
+    // webContents may have already navigated to a page.
+    if (this.webContents._getURL()) {
+      this.currentIndex++;
+      this.history.push(this.webContents._getURL());
+    }
+    this.webContents.on('navigation-entry-committed' as any, (event: Electron.Event, url: string, inPage: boolean, replaceEntry: boolean) => {
+      if (this.inPageIndex > -1 && !inPage) {
+        // Navigated to a new page, clear in-page mark.
+        this.inPageIndex = -1;
+      } else if (this.inPageIndex === -1 && inPage && !replaceEntry) {
+        // Started in-page navigations.
+        this.inPageIndex = this.currentIndex;
+      }
+      if (this.pendingIndex >= 0) {
+        // Go to index.
+        this.currentIndex = this.pendingIndex;
+        this.pendingIndex = -1;
+        this.history[this.currentIndex] = url;
+      } else if (replaceEntry) {
+        // Non-user initialized navigation.
+        this.history[this.currentIndex] = url;
+      } else {
+        // Normal navigation. Clear history.
+        this.history = this.history.slice(0, this.currentIndex + 1);
+        this.currentIndex++;
+        this.history.push(url);
+      }
+    });
+  }
+
+  loadURL (url: string, options?: LoadURLOptions): Promise<void> {
+    if (options == null) {
+      options = {};
+    }
+    const p = new Promise<void>((resolve, reject) => {
+      const resolveAndCleanup = () => {
+        removeListeners();
+        resolve();
+      };
+      const rejectAndCleanup = (errorCode: number, errorDescription: string, url: string) => {
+        const err = new Error(`${errorDescription} (${errorCode}) loading '${typeof url === 'string' ? url.substr(0, 2048) : url}'`);
+        Object.assign(err, { errno: errorCode, code: errorDescription, url });
+        removeListeners();
+        reject(err);
+      };
+      const finishListener = () => {
+        resolveAndCleanup();
+      };
+      const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
+        if (isMainFrame) {
+          rejectAndCleanup(errorCode, errorDescription, validatedURL);
+        }
+      };
+
+      let navigationStarted = false;
+      const navigationListener = (event: Electron.Event, url: string, isSameDocument: boolean, isMainFrame: boolean) => {
+        if (isMainFrame) {
+          if (navigationStarted && !isSameDocument) {
+            // the webcontents has started another unrelated navigation in the
+            // main frame (probably from the app calling `loadURL` again); reject
+            // the promise
+            // We should only consider the request aborted if the "navigation" is
+            // actually navigating and not simply transitioning URL state in the
+            // current context.  E.g. pushState and `location.hash` changes are
+            // considered navigation events but are triggered with isSameDocument.
+            // We can ignore these to allow virtual routing on page load as long
+            // as the routing does not leave the document
+            return rejectAndCleanup(-3, 'ERR_ABORTED', url);
+          }
+          navigationStarted = true;
+        }
+      };
+      const stopLoadingListener = () => {
+        // By the time we get here, either 'finish' or 'fail' should have fired
+        // if the navigation occurred. However, in some situations (e.g. when
+        // attempting to load a page with a bad scheme), loading will stop
+        // without emitting finish or fail. In this case, we reject the promise
+        // with a generic failure.
+        // TODO(jeremy): enumerate all the cases in which this can happen. If
+        // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
+        // would be more appropriate.
+        rejectAndCleanup(-2, 'ERR_FAILED', url);
+      };
+      const removeListeners = () => {
+        this.webContents.removeListener('did-finish-load', finishListener);
+        this.webContents.removeListener('did-fail-load', failListener);
+        this.webContents.removeListener('did-start-navigation', navigationListener);
+        this.webContents.removeListener('did-stop-loading', stopLoadingListener);
+        this.webContents.removeListener('destroyed', stopLoadingListener);
+      };
+      this.webContents.on('did-finish-load', finishListener);
+      this.webContents.on('did-fail-load', failListener);
+      this.webContents.on('did-start-navigation', navigationListener);
+      this.webContents.on('did-stop-loading', stopLoadingListener);
+      this.webContents.on('destroyed', stopLoadingListener);
+    });
+    // Add a no-op rejection handler to silence the unhandled rejection error.
+    p.catch(() => {});
+    this.pendingIndex = -1;
+    this.webContents._loadURL(url, options);
+    this.webContents.emit('load-url', url, options);
+    return p;
+  }
+
+  getURL () {
+    if (this.currentIndex === -1) {
+      return '';
+    } else {
+      return this.history[this.currentIndex];
+    }
+  }
+
+  stop () {
+    this.pendingIndex = -1;
+    return this.webContents._stop();
+  }
+
+  reload () {
+    this.pendingIndex = this.currentIndex;
+    return this.webContents._loadURL(this.getURL(), {});
+  }
+
+  reloadIgnoringCache () {
+    this.pendingIndex = this.currentIndex;
+    return this.webContents._loadURL(this.getURL(), {
+      extraHeaders: 'pragma: no-cache\n',
+      reloadIgnoringCache: true
+    });
+  }
+
+  canGoBack () {
+    return this.getActiveIndex() > 0;
+  }
+
+  canGoForward () {
+    return this.getActiveIndex() < this.history.length - 1;
+  }
+
+  canGoToIndex (index: number) {
+    return index >= 0 && index < this.history.length;
+  }
+
+  canGoToOffset (offset: number) {
+    return this.canGoToIndex(this.currentIndex + offset);
+  }
+
+  clearHistory () {
+    this.history = [];
+    this.currentIndex = -1;
+    this.pendingIndex = -1;
+    this.inPageIndex = -1;
+  }
+
+  goBack () {
+    if (!this.canGoBack()) {
+      return;
+    }
+    this.pendingIndex = this.getActiveIndex() - 1;
+    if (this.inPageIndex > -1 && this.pendingIndex >= this.inPageIndex) {
+      return this.webContents._goBack();
+    } else {
+      return this.webContents._loadURL(this.history[this.pendingIndex], {});
+    }
+  }
+
+  goForward () {
+    if (!this.canGoForward()) {
+      return;
+    }
+    this.pendingIndex = this.getActiveIndex() + 1;
+    if (this.inPageIndex > -1 && this.pendingIndex >= this.inPageIndex) {
+      return this.webContents._goForward();
+    } else {
+      return this.webContents._loadURL(this.history[this.pendingIndex], {});
+    }
+  }
+
+  goToIndex (index: number) {
+    if (!this.canGoToIndex(index)) {
+      return;
+    }
+    this.pendingIndex = index;
+    return this.webContents._loadURL(this.history[this.pendingIndex], {});
+  }
+
+  goToOffset (offset: number) {
+    if (!this.canGoToOffset(offset)) {
+      return;
+    }
+    const pendingIndex = this.currentIndex + offset;
+    if (this.inPageIndex > -1 && pendingIndex >= this.inPageIndex) {
+      this.pendingIndex = pendingIndex;
+      return this.webContents._goToOffset(offset);
+    } else {
+      return this.goToIndex(pendingIndex);
+    }
+  }
+
+  getActiveIndex () {
+    if (this.pendingIndex === -1) {
+      return this.currentIndex;
+    } else {
+      return this.pendingIndex;
+    }
+  }
+
+  length () {
+    return this.history.length;
+  }
+}

lib/browser/remote/objects-registry.ts

@@ -0,0 +1,128 @@
+import { WebContents } from 'electron/main';
+
+const getOwnerKey = (webContents: WebContents, contextId: string) => {
+  return `${webContents.id}-${contextId}`;
+};
+
+class ObjectsRegistry {
+  private nextId: number = 0
+
+  // Stores all objects by ref-counting.
+  // (id) => {object, count}
+  private storage: Record<number, { count: number, object: any }> = {}
+
+  // Stores the IDs + refCounts of objects referenced by WebContents.
+  // (ownerKey) => { id: refCount }
+  private owners: Record<string, Map<number, number>> = {}
+
+  private electronIds = new WeakMap<Object, number>();
+
+  // Register a new object and return its assigned ID. If the object is already
+  // registered then the already assigned ID would be returned.
+  add (webContents: WebContents, contextId: string, obj: any) {
+    // Get or assign an ID to the object.
+    const id = this.saveToStorage(obj);
+
+    // Add object to the set of referenced objects.
+    const ownerKey = getOwnerKey(webContents, contextId);
+    let owner = this.owners[ownerKey];
+    if (!owner) {
+      owner = this.owners[ownerKey] = new Map();
+      this.registerDeleteListener(webContents, contextId);
+    }
+    if (!owner.has(id)) {
+      owner.set(id, 0);
+      // Increase reference count if not referenced before.
+      this.storage[id].count++;
+    }
+
+    owner.set(id, owner.get(id)! + 1);
+    return id;
+  }
+
+  // Get an object according to its ID.
+  get (id: number) {
+    const pointer = this.storage[id];
+    if (pointer != null) return pointer.object;
+  }
+
+  // Dereference an object according to its ID.
+  // Note that an object may be double-freed (cleared when page is reloaded, and
+  // then garbage collected in old page).
+  remove (webContents: WebContents, contextId: string, id: number) {
+    const ownerKey = getOwnerKey(webContents, contextId);
+    const owner = this.owners[ownerKey];
+    if (owner && owner.has(id)) {
+      const newRefCount = owner.get(id)! - 1;
+
+      // Only completely remove if the number of references GCed in the
+      // renderer is the same as the number of references we sent them
+      if (newRefCount <= 0) {
+        // Remove the reference in owner.
+        owner.delete(id);
+        // Dereference from the storage.
+        this.dereference(id);
+      } else {
+        owner.set(id, newRefCount);
+      }
+    }
+  }
+
+  // Clear all references to objects refrenced by the WebContents.
+  clear (webContents: WebContents, contextId: string) {
+    const ownerKey = getOwnerKey(webContents, contextId);
+    const owner = this.owners[ownerKey];
+    if (!owner) return;
+
+    for (const id of owner.keys()) this.dereference(id);
+
+    delete this.owners[ownerKey];
+  }
+
+  // Private: Saves the object into storage and assigns an ID for it.
+  saveToStorage (object: any) {
+    let id = this.electronIds.get(object);
+    if (!id) {
+      id = ++this.nextId;
+      this.storage[id] = {
+        count: 0,
+        object: object
+      };
+      this.electronIds.set(object, id);
+    }
+    return id;
+  }
+
+  // Private: Dereference the object from store.
+  dereference (id: number) {
+    const pointer = this.storage[id];
+    if (pointer == null) {
+      return;
+    }
+    pointer.count -= 1;
+    if (pointer.count === 0) {
+      this.electronIds.delete(pointer.object);
+      delete this.storage[id];
+    }
+  }
+
+  // Private: Clear the storage when renderer process is destroyed.
+  registerDeleteListener (webContents: WebContents, contextId: string) {
+    // contextId => ${processHostId}-${contextCount}
+    const processHostId = contextId.split('-')[0];
+    const listener = (_: any, deletedProcessHostId: string) => {
+      if (deletedProcessHostId &&
+          deletedProcessHostId.toString() === processHostId) {
+        webContents.removeListener('render-view-deleted' as any, listener);
+        this.clear(webContents, contextId);
+      }
+    };
+    // Note that the "render-view-deleted" event may not be emitted on time when
+    // the renderer process get destroyed because of navigation, we rely on the
+    // renderer process to send "ELECTRON_BROWSER_CONTEXT_RELEASE" message to
+    // guard this situation.
+    webContents.on('render-view-deleted' as any, listener);
+  }
+}
+
+export default new ObjectsRegistry();

lib/browser/remote/server.ts

@@ -0,0 +1,519 @@
+import * as electron from 'electron/main';
+import { EventEmitter } from 'events';
+import objectsRegistry from '@electron/internal/browser/remote/objects-registry';
+import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
+import { isPromise, isSerializableObject, deserialize, serialize } from '@electron/internal/common/type-utils';
+import type { MetaTypeFromRenderer, ObjectMember, MetaType, ObjProtoDescriptor } from '@electron/internal/common/remote/types';
+import { IPC_MESSAGES } from '@electron/internal/common/remote/ipc-messages';
+
+const v8Util = process._linkedBinding('electron_common_v8_util');
+const eventBinding = process._linkedBinding('electron_browser_event');
+const features = process._linkedBinding('electron_common_features');
+
+if (!features.isRemoteModuleEnabled()) {
+  throw new Error('remote module is disabled');
+}
+
+// The internal properties of Function.
+const FUNCTION_PROPERTIES = [
+  'length', 'name', 'arguments', 'caller', 'prototype'
+];
+
+type RendererFunctionId = [string, number] // [contextId, funcId]
+type FinalizerInfo = { id: RendererFunctionId, webContents: electron.WebContents, frameId: [number, number] };
+type CallIntoRenderer = (...args: any[]) => void
+
+// The remote functions in renderer processes.
+const rendererFunctionCache = new Map<string, WeakRef<CallIntoRenderer>>();
+// eslint-disable-next-line no-undef
+const finalizationRegistry = new FinalizationRegistry((fi: FinalizerInfo) => {
+  const mapKey = fi.id[0] + '~' + fi.id[1];
+  const ref = rendererFunctionCache.get(mapKey);
+  if (ref !== undefined && ref.deref() === undefined) {
+    rendererFunctionCache.delete(mapKey);
+    if (!fi.webContents.isDestroyed()) {
+      try {
+        fi.webContents._sendToFrameInternal(fi.frameId, IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, fi.id[0], fi.id[1]);
+      } catch (error) {
+        console.warn(`_sendToFrameInternal() failed: ${error}`);
+      }
+    }
+  }
+});
+
+function getCachedRendererFunction (id: RendererFunctionId): CallIntoRenderer | undefined {
+  const mapKey = id[0] + '~' + id[1];
+  const ref = rendererFunctionCache.get(mapKey);
+  if (ref !== undefined) {
+    const deref = ref.deref();
+    if (deref !== undefined) return deref;
+  }
+}
+function setCachedRendererFunction (id: RendererFunctionId, wc: electron.WebContents, frameId: [number, number], value: CallIntoRenderer) {
+  // eslint-disable-next-line no-undef
+  const wr = new WeakRef<CallIntoRenderer>(value);
+  const mapKey = id[0] + '~' + id[1];
+  rendererFunctionCache.set(mapKey, wr);
+  finalizationRegistry.register(value, {
+    id,
+    webContents: wc,
+    frameId
+  } as FinalizerInfo);
+  return value;
+}
+
+const locationInfo = new WeakMap<Object, string>();
+
+// Return the description of object's members:
+const getObjectMembers = function (object: any): ObjectMember[] {
+  let names = Object.getOwnPropertyNames(object);
+  // For Function, we should not override following properties even though they
+  // are "own" properties.
+  if (typeof object === 'function') {
+    names = names.filter((name) => {
+      return !FUNCTION_PROPERTIES.includes(name);
+    });
+  }
+  // Map properties to descriptors.
+  return names.map((name) => {
+    const descriptor = Object.getOwnPropertyDescriptor(object, name)!;
+    let type: ObjectMember['type'];
+    let writable = false;
+    if (descriptor.get === undefined && typeof object[name] === 'function') {
+      type = 'method';
+    } else {
+      if (descriptor.set || descriptor.writable) writable = true;
+      type = 'get';
+    }
+    return { name, enumerable: descriptor.enumerable, writable, type };
+  });
+};
+
+// Return the description of object's prototype.
+const getObjectPrototype = function (object: any): ObjProtoDescriptor {
+  const proto = Object.getPrototypeOf(object);
+  if (proto === null || proto === Object.prototype) return null;
+  return {
+    members: getObjectMembers(proto),
+    proto: getObjectPrototype(proto)
+  };
+};
+
+// Convert a real value into meta data.
+const valueToMeta = function (sender: electron.WebContents, contextId: string, value: any, optimizeSimpleObject = false): MetaType {
+  // Determine the type of value.
+  let type: MetaType['type'];
+
+  switch (typeof value) {
+    case 'object':
+      // Recognize certain types of objects.
+      if (value instanceof Buffer) {
+        type = 'buffer';
+      } else if (value && value.constructor && value.constructor.name === 'NativeImage') {
+        type = 'nativeimage';
+      } else if (Array.isArray(value)) {
+        type = 'array';
+      } else if (value instanceof Error) {
+        type = 'error';
+      } else if (isSerializableObject(value)) {
+        type = 'value';
+      } else if (isPromise(value)) {
+        type = 'promise';
+      } else if (Object.prototype.hasOwnProperty.call(value, 'callee') && value.length != null) {
+        // Treat the arguments object as array.
+        type = 'array';
+      } else if (optimizeSimpleObject && v8Util.getHiddenValue(value, 'simple')) {
+        // Treat simple objects as value.
+        type = 'value';
+      } else {
+        type = 'object';
+      }
+      break;
+    case 'function':
+      type = 'function';
+      break;
+    default:
+      type = 'value';
+      break;
+  }
+
+  // Fill the meta object according to value's type.
+  if (type === 'array') {
+    return {
+      type,
+      members: value.map((el: any) => valueToMeta(sender, contextId, el, optimizeSimpleObject))
+    };
+  } else if (type === 'nativeimage') {
+    return { type, value: serialize(value) };
+  } else if (type === 'object' || type === 'function') {
+    return {
+      type,
+      name: value.constructor ? value.constructor.name : '',
+      // Reference the original value if it's an object, because when it's
+      // passed to renderer we would assume the renderer keeps a reference of
+      // it.
+      id: objectsRegistry.add(sender, contextId, value),
+      members: getObjectMembers(value),
+      proto: getObjectPrototype(value)
+    };
+  } else if (type === 'buffer') {
+    return { type, value };
+  } else if (type === 'promise') {
+    // Add default handler to prevent unhandled rejections in main process
+    // Instead they should appear in the renderer process
+    value.then(function () {}, function () {});
+
+    return {
+      type,
+      then: valueToMeta(sender, contextId, function (onFulfilled: Function, onRejected: Function) {
+        value.then(onFulfilled, onRejected);
+      })
+    };
+  } else if (type === 'error') {
+    return {
+      type,
+      value,
+      members: Object.keys(value).map(name => ({
+        name,
+        value: valueToMeta(sender, contextId, value[name])
+      }))
+    };
+  } else {
+    return {
+      type: 'value',
+      value
+    };
+  }
+};
+
+const throwRPCError = function (message: string) {
+  const error = new Error(message) as Error & {code: string, errno: number};
+  error.code = 'EBADRPC';
+  error.errno = -72;
+  throw error;
+};
+
+const removeRemoteListenersAndLogWarning = (sender: any, callIntoRenderer: (...args: any[]) => void) => {
+  const location = locationInfo.get(callIntoRenderer);
+  let message = 'Attempting to call a function in a renderer window that has been closed or released.' +
+    `\nFunction provided here: ${location}`;
+
+  if (sender instanceof EventEmitter) {
+    const remoteEvents = sender.eventNames().filter((eventName) => {
+      return sender.listeners(eventName).includes(callIntoRenderer);
+    });
+
+    if (remoteEvents.length > 0) {
+      message += `\nRemote event names: ${remoteEvents.join(', ')}`;
+      remoteEvents.forEach((eventName) => {
+        sender.removeListener(eventName, callIntoRenderer);
+      });
+    }
+  }
+
+  console.warn(message);
+};
+
+const fakeConstructor = (constructor: Function, name: string) =>
+  new Proxy(Object, {
+    get (target, prop, receiver) {
+      if (prop === 'name') {
+        return name;
+      } else {
+        return Reflect.get(target, prop, receiver);
+      }
+    }
+  });
+
+// Convert array of meta data from renderer into array of real values.
+const unwrapArgs = function (sender: electron.WebContents, frameId: [number, number], contextId: string, args: any[]) {
+  const metaToValue = function (meta: MetaTypeFromRenderer): any {
+    switch (meta.type) {
+      case 'nativeimage':
+        return deserialize(meta.value);
+      case 'value':
+        return meta.value;
+      case 'remote-object':
+        return objectsRegistry.get(meta.id);
+      case 'array':
+        return unwrapArgs(sender, frameId, contextId, meta.value);
+      case 'buffer':
+        return Buffer.from(meta.value.buffer, meta.value.byteOffset, meta.value.byteLength);
+      case 'promise':
+        return Promise.resolve({
+          then: metaToValue(meta.then)
+        });
+      case 'object': {
+        const ret: any = meta.name !== 'Object' ? Object.create({
+          constructor: fakeConstructor(Object, meta.name)
+        }) : {};
+
+        for (const { name, value } of meta.members) {
+          ret[name] = metaToValue(value);
+        }
+        return ret;
+      }
+      case 'function-with-return-value': {
+        const returnValue = metaToValue(meta.value);
+        return function () {
+          return returnValue;
+        };
+      }
+      case 'function': {
+        // Merge contextId and meta.id, since meta.id can be the same in
+        // different webContents.
+        const objectId: [string, number] = [contextId, meta.id];
+
+        // Cache the callbacks in renderer.
+        const cachedFunction = getCachedRendererFunction(objectId);
+        if (cachedFunction !== undefined) { return cachedFunction; }
+
+        const callIntoRenderer = function (this: any, ...args: any[]) {
+          let succeed = false;
+          if (!sender.isDestroyed()) {
+            try {
+              succeed = sender._sendToFrameInternal(frameId, IPC_MESSAGES.RENDERER_CALLBACK, contextId, meta.id, valueToMeta(sender, contextId, args));
+            } catch (error) {
+              console.warn(`_sendToFrameInternal() failed: ${error}`);
+            }
+          }
+          if (!succeed) {
+            removeRemoteListenersAndLogWarning(this, callIntoRenderer);
+          }
+        };
+        locationInfo.set(callIntoRenderer, meta.location);
+        Object.defineProperty(callIntoRenderer, 'length', { value: meta.length });
+
+        setCachedRendererFunction(objectId, sender, frameId, callIntoRenderer);
+        return callIntoRenderer;
+      }
+      default:
+        throw new TypeError(`Unknown type: ${(meta as any).type}`);
+    }
+  };
+  return args.map(metaToValue);
+};
+
+const isRemoteModuleEnabledImpl = function (contents: electron.WebContents) {
+  const webPreferences = contents.getLastWebPreferences() || {};
+  return webPreferences.enableRemoteModule != null ? !!webPreferences.enableRemoteModule : false;
+};
+
+const isRemoteModuleEnabledCache = new WeakMap();
+
+export const isRemoteModuleEnabled = function (contents: electron.WebContents) {
+  if (!isRemoteModuleEnabledCache.has(contents)) {
+    isRemoteModuleEnabledCache.set(contents, isRemoteModuleEnabledImpl(contents));
+  }
+
+  return isRemoteModuleEnabledCache.get(contents);
+};
+
+const handleRemoteCommand = function (channel: string, handler: (event: ElectronInternal.IpcMainInternalEvent, contextId: string, ...args: any[]) => void) {
+  ipcMainInternal.on(channel, (event, contextId: string, ...args: any[]) => {
+    let returnValue;
+    if (!isRemoteModuleEnabled(event.sender)) {
+      event.returnValue = null;
+      return;
+    }
+
+    try {
+      returnValue = handler(event, contextId, ...args);
+    } catch (error) {
+      returnValue = {
+        type: 'exception',
+        value: valueToMeta(event.sender, contextId, error)
+      };
+    }
+
+    if (returnValue !== undefined) {
+      event.returnValue = returnValue;
+    }
+  });
+};
+
+const emitCustomEvent = function (contents: electron.WebContents, eventName: string, ...args: any[]) {
+  const event = eventBinding.createWithSender(contents);
+
+  electron.app.emit(eventName, event, contents, ...args);
+  contents.emit(eventName, event, ...args);
+
+  return event;
+};
+
+const logStack = function (contents: electron.WebContents, code: string, stack: string | undefined) {
+  if (stack) {
+    console.warn(`WebContents (${contents.id}): ${code}`, stack);
+  }
+};
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_WRONG_CONTEXT_ERROR, function (event, contextId, passedContextId, id) {
+  const objectId: [string, number] = [passedContextId, id];
+  const cachedFunction = getCachedRendererFunction(objectId);
+  if (cachedFunction === undefined) {
+    // Do nothing if the error has already been reported before.
+    return;
+  }
+  removeRemoteListenersAndLogWarning(event.sender, cachedFunction);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_REQUIRE, function (event, contextId, moduleName, stack) {
+  logStack(event.sender, `remote.require('${moduleName}')`, stack);
+  const customEvent = emitCustomEvent(event.sender, 'remote-require', moduleName);
+
+  if (customEvent.returnValue === undefined) {
+    if (customEvent.defaultPrevented) {
+      throw new Error(`Blocked remote.require('${moduleName}')`);
+    } else {
+      customEvent.returnValue = process.mainModule.require(moduleName);
+    }
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_GET_BUILTIN, function (event, contextId, moduleName, stack) {
+  logStack(event.sender, `remote.getBuiltin('${moduleName}')`, stack);
+  const customEvent = emitCustomEvent(event.sender, 'remote-get-builtin', moduleName);
+
+  if (customEvent.returnValue === undefined) {
+    if (customEvent.defaultPrevented) {
+      throw new Error(`Blocked remote.getBuiltin('${moduleName}')`);
+    } else {
+      customEvent.returnValue = (electron as any)[moduleName];
+    }
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_GET_GLOBAL, function (event, contextId, globalName, stack) {
+  logStack(event.sender, `remote.getGlobal('${globalName}')`, stack);
+  const customEvent = emitCustomEvent(event.sender, 'remote-get-global', globalName);
+
+  if (customEvent.returnValue === undefined) {
+    if (customEvent.defaultPrevented) {
+      throw new Error(`Blocked remote.getGlobal('${globalName}')`);
+    } else {
+      customEvent.returnValue = (global as any)[globalName];
+    }
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_GET_CURRENT_WINDOW, function (event, contextId, stack) {
+  logStack(event.sender, 'remote.getCurrentWindow()', stack);
+  const customEvent = emitCustomEvent(event.sender, 'remote-get-current-window');
+
+  if (customEvent.returnValue === undefined) {
+    if (customEvent.defaultPrevented) {
+      throw new Error('Blocked remote.getCurrentWindow()');
+    } else {
+      customEvent.returnValue = event.sender.getOwnerBrowserWindow();
+    }
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_GET_CURRENT_WEB_CONTENTS, function (event, contextId, stack) {
+  logStack(event.sender, 'remote.getCurrentWebContents()', stack);
+  const customEvent = emitCustomEvent(event.sender, 'remote-get-current-web-contents');
+
+  if (customEvent.returnValue === undefined) {
+    if (customEvent.defaultPrevented) {
+      throw new Error('Blocked remote.getCurrentWebContents()');
+    } else {
+      customEvent.returnValue = event.sender;
+    }
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_CONSTRUCTOR, function (event, contextId, id, args) {
+  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  const constructor = objectsRegistry.get(id);
+
+  if (constructor == null) {
+    throwRPCError(`Cannot call constructor on missing remote object ${id}`);
+  }
+
+  return valueToMeta(event.sender, contextId, new constructor(...args));
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_FUNCTION_CALL, function (event, contextId, id, args) {
+  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  const func = objectsRegistry.get(id);
+
+  if (func == null) {
+    throwRPCError(`Cannot call function on missing remote object ${id}`);
+  }
+
+  try {
+    return valueToMeta(event.sender, contextId, func(...args), true);
+  } catch (error) {
+    const err = new Error(`Could not call remote function '${func.name || 'anonymous'}'. Check that the function signature is correct. Underlying error: ${error.message}\nUnderlying stack: ${error.stack}\n`);
+    (err as any).cause = error;
+    throw err;
+  }
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CONSTRUCTOR, function (event, contextId, id, method, args) {
+  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  const object = objectsRegistry.get(id);
+
+  if (object == null) {
+    throwRPCError(`Cannot call constructor '${method}' on missing remote object ${id}`);
+  }
+
+  return valueToMeta(event.sender, contextId, new object[method](...args));
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CALL, function (event, contextId, id, method, args) {
+  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  const object = objectsRegistry.get(id);
+
+  if (object == null) {
+    throwRPCError(`Cannot call method '${method}' on missing remote object ${id}`);
+  }
+
+  try {
+    return valueToMeta(event.sender, contextId, object[method](...args), true);
+  } catch (error) {
+    const err = new Error(`Could not call remote method '${method}'. Check that the method signature is correct. Underlying error: ${error.message}\nUnderlying stack: ${error.stack}\n`);
+    (err as any).cause = error;
+    throw err;
+  }
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_SET, function (event, contextId, id, name, args) {
+  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  const obj = objectsRegistry.get(id);
+
+  if (obj == null) {
+    throwRPCError(`Cannot set property '${name}' on missing remote object ${id}`);
+  }
+
+  obj[name] = args[0];
+  return null;
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_GET, function (event, contextId, id, name) {
+  const obj = objectsRegistry.get(id);
+
+  if (obj == null) {
+    throwRPCError(`Cannot get property '${name}' on missing remote object ${id}`);
+  }
+
+  return valueToMeta(event.sender, contextId, obj[name]);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_DEREFERENCE, function (event, contextId, id) {
+  objectsRegistry.remove(event.sender, contextId, id);
+});
+
+handleRemoteCommand(IPC_MESSAGES.BROWSER_CONTEXT_RELEASE, (event, contextId) => {
+  objectsRegistry.clear(event.sender, contextId);
+});

lib/browser/rpc-server.ts

@@ -1,14 +1,12 @@
 import { app } from 'electron/main';
 import type { WebContents } from 'electron/main';
-import { clipboard, nativeImage } from 'electron/common';
+import { clipboard } from 'electron/common';
 import * as fs from 'fs';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import * as typeUtils from '@electron/internal/common/type-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as desktopCapturerModule from '@electron/internal/browser/desktop-capturer';
-
 const eventBinding = process._linkedBinding('electron_browser_event');
 
 const emitCustomEvent = function (contents: WebContents, eventName: string, ...args: any[]) {
@@ -39,6 +37,10 @@ ipcMainInternal.handle(IPC_MESSAGES.BROWSER_GET_LAST_WEB_PREFERENCES, function (
   return event.sender.getLastWebPreferences();
 });
 
+ipcMainInternal.handle(IPC_MESSAGES.BROWSER_GET_PROCESS_MEMORY_INFO, function (event) {
+  return event.sender._getProcessMemoryInfo();
+});
+
 // Methods not listed in this set are called directly in the renderer process.
 const allowedClipboardMethods = (() => {
   switch (process.platform) {
@@ -60,7 +62,7 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, function (event, me
 });
 
 if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  const desktopCapturer = require('@electron/internal/browser/desktop-capturer') as typeof desktopCapturerModule;
+  const desktopCapturer = require('@electron/internal/browser/desktop-capturer');
 
   ipcMainInternal.handle(IPC_MESSAGES.DESKTOP_CAPTURER_GET_SOURCES, async function (event, options: Electron.SourcesOptions, stack: string) {
     logStack(event.sender, 'desktopCapturer.getSources()', stack);
@@ -71,7 +73,7 @@ if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
       return [];
     }
 
-    return typeUtils.serialize(await desktopCapturer.getSourcesImpl(event.sender, options));
+    return typeUtils.serialize(await desktopCapturer.getSourcesImpl(event, options));
   });
 }
 
@@ -102,10 +104,22 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD, async function (event
   };
 });
 
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_BACK, function (event) {
+  event.sender.goBack();
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_FORWARD, function (event) {
+  event.sender.goForward();
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_TO_OFFSET, function (event, offset) {
+  event.sender.goToOffset(offset);
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_LENGTH, function (event) {
+  event.returnValue = event.sender.length();
+});
+
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadPath: string, error: Error) {
   event.sender.emit('preload-error', event, preloadPath, error);
 });
-
-ipcMainInternal.handle(IPC_MESSAGES.NATIVE_IMAGE_CREATE_THUMBNAIL_FROM_PATH, async (_, path: string, size: Electron.Size) => {
-  return typeUtils.serialize(await nativeImage.createThumbnailFromPath(path, size));
-});

lib/common/api/clipboard.ts

@@ -1,13 +1,10 @@
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-import type * as typeUtilsModule from '@electron/internal/common/type-utils';
-
 const clipboard = process._linkedBinding('electron_common_clipboard');
 
 if (process.type === 'renderer') {
-  const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
-  const typeUtils = require('@electron/internal/common/type-utils') as typeof typeUtilsModule;
+  const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils');
+  const typeUtils = require('@electron/internal/common/type-utils');
 
   const makeRemoteMethod = function (method: keyof Electron.Clipboard) {
     return (...args: any[]) => {

lib/common/ipc-messages.ts

@@ -4,6 +4,7 @@ export const enum IPC_MESSAGES {
   BROWSER_PRELOAD_ERROR = 'BROWSER_PRELOAD_ERROR',
   BROWSER_SANDBOX_LOAD = 'BROWSER_SANDBOX_LOAD',
   BROWSER_WINDOW_CLOSE = 'BROWSER_WINDOW_CLOSE',
+  BROWSER_GET_PROCESS_MEMORY_INFO = 'BROWSER_GET_PROCESS_MEMORY_INFO',
 
   GUEST_INSTANCE_VISIBILITY_CHANGE = 'GUEST_INSTANCE_VISIBILITY_CHANGE',
 
@@ -29,10 +30,14 @@ export const enum IPC_MESSAGES {
 
   RENDERER_WEB_FRAME_METHOD = 'RENDERER_WEB_FRAME_METHOD',
 
+  NAVIGATION_CONTROLLER_GO_BACK = 'NAVIGATION_CONTROLLER_GO_BACK',
+  NAVIGATION_CONTROLLER_GO_FORWARD = 'NAVIGATION_CONTROLLER_GO_FORWARD',
+  NAVIGATION_CONTROLLER_GO_TO_OFFSET = 'NAVIGATION_CONTROLLER_GO_TO_OFFSET',
+  NAVIGATION_CONTROLLER_LENGTH = 'NAVIGATION_CONTROLLER_LENGTH',
+
   INSPECTOR_CONFIRM = 'INSPECTOR_CONFIRM',
   INSPECTOR_CONTEXT_MENU = 'INSPECTOR_CONTEXT_MENU',
   INSPECTOR_SELECT_FILE = 'INSPECTOR_SELECT_FILE',
 
   DESKTOP_CAPTURER_GET_SOURCES = 'DESKTOP_CAPTURER_GET_SOURCES',
-  NATIVE_IMAGE_CREATE_THUMBNAIL_FROM_PATH = 'NATIVE_IMAGE_CREATE_THUMBNAIL_FROM_PATH',
 }

lib/common/parse-features-string.ts

@@ -56,28 +56,41 @@ function coerce (key: string, value: string): CoercedValue {
   }
 }
 
-export function parseCommaSeparatedKeyValue (source: string) {
+export function parseCommaSeparatedKeyValue (source: string, useSoonToBeDeprecatedBehaviorForBareKeys: boolean) {
+  const bareKeys = [] as string[];
   const parsed = {} as { [key: string]: any };
   for (const keyValuePair of source.split(',')) {
     const [key, value] = keyValuePair.split('=').map(str => str.trim());
-    if (key) { parsed[key] = coerce(key, value); }
+    if (useSoonToBeDeprecatedBehaviorForBareKeys && value === undefined) {
+      if (key) { bareKeys.push(key); }
+      continue;
+    }
+    parsed[key] = coerce(key, value);
   }
 
-  return parsed;
+  return { parsed, bareKeys };
 }
 
 export function parseWebViewWebPreferences (preferences: string) {
-  return parseCommaSeparatedKeyValue(preferences);
+  return parseCommaSeparatedKeyValue(preferences, false).parsed;
 }
 
-const allowedWebPreferences = ['zoomFactor', 'nodeIntegration', 'javascript', 'contextIsolation', 'webviewTag'] as const;
+const allowedWebPreferences = ['zoomFactor', 'nodeIntegration', 'enableRemoteModule', 'javascript', 'contextIsolation', 'webviewTag'] as const;
 type AllowedWebPreference = (typeof allowedWebPreferences)[number];
 
 /**
  * Parses a feature string that has the format used in window.open().
+ *
+ * `useSoonToBeDeprecatedBehaviorForBareKeys` - In the html spec, windowFeatures keys
+ * without values are interpreted as `true`. Previous versions of Electron did
+ * not respect this. In order to not break any applications, this will be
+ * flipped in the next major version.
  */
-export function parseFeatures (features: string) {
-  const parsed = parseCommaSeparatedKeyValue(features);
+export function parseFeatures (
+  features: string,
+  useSoonToBeDeprecatedBehaviorForBareKeys: boolean = true
+) {
+  const { parsed, bareKeys } = parseCommaSeparatedKeyValue(features, useSoonToBeDeprecatedBehaviorForBareKeys);
 
   const webPreferences: { [K in AllowedWebPreference]?: any } = {};
   allowedWebPreferences.forEach((key) => {
@@ -91,6 +104,7 @@ export function parseFeatures (features: string) {
 
   return {
     options: parsed as Omit<BrowserWindowConstructorOptions, 'webPreferences'>,
-    webPreferences
+    webPreferences,
+    additionalFeatures: bareKeys
   };
 }

lib/common/remote/types.ts

@@ -0,0 +1,85 @@
+import type { Size } from 'electron/main';
+import type { NativeImage } from 'electron/common';
+
+export type ObjectMember = {
+  name: string,
+  value?: any,
+  enumerable?: boolean,
+  writable?: boolean,
+  type?: 'method' | 'get'
+}
+
+export type ObjProtoDescriptor = {
+  members: ObjectMember[],
+  proto: ObjProtoDescriptor
+} | null
+
+export type MetaType = {
+  type: 'object' | 'function',
+  name: string,
+  members: ObjectMember[],
+  proto: ObjProtoDescriptor,
+  id: number,
+} | {
+  type: 'value',
+  value: any,
+} | {
+  type: 'buffer',
+  value: Uint8Array,
+} | {
+  type: 'array',
+  members: MetaType[]
+} | {
+  type: 'error',
+  value: Error,
+  members: ObjectMember[]
+} | {
+  type: 'exception',
+  value: MetaType,
+} | {
+  type: 'promise',
+  then: MetaType
+} | {
+  type: 'nativeimage'
+  value: NativeImage
+}
+
+export type MetaTypeFromRenderer = {
+  type: 'value',
+  value: any
+} | {
+  type: 'remote-object',
+  id: number
+} | {
+  type: 'array',
+  value: MetaTypeFromRenderer[]
+} | {
+  type: 'buffer',
+  value: Uint8Array
+} | {
+  type: 'promise',
+  then: MetaTypeFromRenderer
+} | {
+  type: 'object',
+  name: string,
+  members: {
+    name: string,
+    value: MetaTypeFromRenderer
+  }[]
+} | {
+  type: 'function-with-return-value',
+  value: MetaTypeFromRenderer
+} | {
+  type: 'function',
+  id: number,
+  location: string,
+  length: number
+} | {
+  type: 'nativeimage',
+  value: {
+    size: Size,
+    buffer: Buffer,
+    scaleFactor: number,
+    dataURL: string
+  }[]
+}

lib/common/type-utils.ts

@@ -1,6 +1,4 @@
-function getCreateNativeImage () {
-  return process._linkedBinding('electron_common_native_image').nativeImage.createEmpty;
-}
+const { nativeImage } = process._linkedBinding('electron_common_native_image');
 
 export function isPromise (val: any) {
   return (
@@ -59,8 +57,8 @@ function serializeNativeImage (image: Electron.NativeImage) {
   return { __ELECTRON_SERIALIZED_NativeImage__: true, representations };
 }
 
-function deserializeNativeImage (value: any, createNativeImage: typeof Electron.nativeImage['createEmpty']) {
-  const image = createNativeImage();
+function deserializeNativeImage (value: any) {
+  const image = nativeImage.createEmpty();
 
   // Use Buffer when there's only one representation for better perf.
   // This avoids compressing to/from PNG where it's not necessary to
@@ -95,15 +93,15 @@ export function serialize (value: any): any {
   }
 }
 
-export function deserialize (value: any, createNativeImage: typeof Electron.nativeImage['createEmpty'] = getCreateNativeImage()): any {
+export function deserialize (value: any): any {
   if (value && value.__ELECTRON_SERIALIZED_NativeImage__) {
-    return deserializeNativeImage(value, createNativeImage);
+    return deserializeNativeImage(value);
   } else if (Array.isArray(value)) {
-    return value.map(value => deserialize(value, createNativeImage));
+    return value.map(deserialize);
   } else if (isSerializableObject(value)) {
     return value;
   } else if (value instanceof Object) {
-    return objectMap(value, value => deserialize(value, createNativeImage));
+    return objectMap(value, deserialize);
   } else {
     return value;
   }

lib/common/web-view-events.ts

@@ -18,7 +18,7 @@ export const webViewEvents: Record<string, readonly string[]> = {
   'did-navigate': ['url', 'httpResponseCode', 'httpStatusText'],
   'did-frame-navigate': ['url', 'httpResponseCode', 'httpStatusText', 'isMainFrame', 'frameProcessId', 'frameRoutingId'],
   'did-navigate-in-page': ['url', 'isMainFrame', 'frameProcessId', 'frameRoutingId'],
-  '-focus-change': ['focus'],
+  'focus-change': ['focus', 'guestInstanceId'],
   close: [],
   crashed: [],
   'render-process-gone': ['details'],

lib/isolated_renderer/init.ts

@@ -1,9 +1,13 @@
-/* global isolatedApi */
+/* global nodeProcess, isolatedWorld */
 
-import type * as webViewElementModule from '@electron/internal/renderer/web-view/web-view-element';
+process._linkedBinding = nodeProcess._linkedBinding;
 
-if (isolatedApi.guestViewInternal) {
+const v8Util = process._linkedBinding('electron_common_v8_util');
+
+const webViewImpl = v8Util.getHiddenValue(isolatedWorld, 'web-view-impl');
+
+if (webViewImpl) {
   // Must setup the WebView element in main world.
-  const { setupWebView } = require('@electron/internal/renderer/web-view/web-view-element') as typeof webViewElementModule;
-  setupWebView(isolatedApi);
+  const { setupWebView } = require('@electron/internal/renderer/web-view/web-view-element');
+  setupWebView(v8Util, webViewImpl);
 }

lib/renderer/api/context-bridge.ts

@@ -1,7 +1,7 @@
-const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
 const binding = process._linkedBinding('electron_renderer_context_bridge');
 
-const contextIsolationEnabled = mainFrame.getWebPreference('contextIsolation');
+const contextIsolationEnabled = getWebPreference(window, 'contextIsolation');
 
 const checkContextIsolationEnabled = () => {
   if (!contextIsolationEnabled) throw new Error('contextBridge API can only be used when contextIsolation is enabled');

lib/renderer/api/ipc-renderer.ts

@@ -18,7 +18,7 @@ ipcRenderer.sendToHost = function (channel, ...args) {
 };
 
 ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
-  return ipc.sendTo(webContentsId, channel, args);
+  return ipc.sendTo(internal, webContentsId, channel, args);
 };
 
 ipcRenderer.invoke = async function (channel, ...args) {

lib/renderer/api/module-list.ts

@@ -1,3 +1,7 @@
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
+
+const enableRemoteModule = getWebPreference(window, 'enableRemoteModule');
+
 // Renderer side modules, please sort alphabetically.
 export const rendererModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'contextBridge', loader: () => require('./context-bridge') },
@@ -13,3 +17,10 @@ if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
     loader: () => require('@electron/internal/renderer/api/desktop-capturer')
   });
 }
+
+if (BUILDFLAG(ENABLE_REMOTE_MODULE) && enableRemoteModule) {
+  rendererModuleList.push({
+    name: 'remote',
+    loader: () => require('@electron/internal/renderer/api/remote')
+  });
+}

lib/renderer/api/native-image.ts

@@ -1,11 +1,3 @@
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-import { deserialize } from '@electron/internal/common/type-utils';
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
 const { nativeImage } = process._linkedBinding('electron_common_native_image');
 
-nativeImage.createThumbnailFromPath = async (path: string, size: Electron.Size) => {
-  return deserialize(await ipcRendererInternal.invoke(IPC_MESSAGES.NATIVE_IMAGE_CREATE_THUMBNAIL_FROM_PATH, path, size));
-};
-
 export default nativeImage;

lib/renderer/api/remote.ts

@@ -0,0 +1,395 @@
+import { CallbacksRegistry } from '../remote/callbacks-registry';
+import { isPromise, isSerializableObject, serialize, deserialize } from '../../common/type-utils';
+import { MetaTypeFromRenderer, ObjectMember, ObjProtoDescriptor, MetaType } from '../../common/remote/types';
+import { ipcRendererInternal } from '../ipc-renderer-internal';
+import type { BrowserWindow, WebContents } from 'electron/main';
+import deprecate from '@electron/internal/common/api/deprecate';
+import { browserModuleNames } from '@electron/internal/browser/api/module-names';
+import { commonModuleList } from '@electron/internal/common/api/module-list';
+import { IPC_MESSAGES } from '@electron/internal/common/remote/ipc-messages';
+
+deprecate.log('The remote module is deprecated. Use https://github.com/electron/remote instead.');
+
+const v8Util = process._linkedBinding('electron_common_v8_util');
+const { hasSwitch } = process._linkedBinding('electron_common_command_line');
+
+const callbacksRegistry = new CallbacksRegistry();
+const remoteObjectCache = new Map();
+const finalizationRegistry = new FinalizationRegistry((id: number) => {
+  const ref = remoteObjectCache.get(id);
+  if (ref !== undefined && ref.deref() === undefined) {
+    remoteObjectCache.delete(id);
+    ipcRendererInternal.send(IPC_MESSAGES.BROWSER_DEREFERENCE, contextId, id, 0);
+  }
+});
+
+const electronIds = new WeakMap<Object, number>();
+const isReturnValue = new WeakSet<Object>();
+
+function getCachedRemoteObject (id: number) {
+  const ref = remoteObjectCache.get(id);
+  if (ref !== undefined) {
+    const deref = ref.deref();
+    if (deref !== undefined) return deref;
+  }
+}
+function setCachedRemoteObject (id: number, value: any) {
+  const wr = new WeakRef(value);
+  remoteObjectCache.set(id, wr);
+  finalizationRegistry.register(value, id);
+  return value;
+}
+
+// An unique ID that can represent current context.
+const contextId = v8Util.getHiddenValue<string>(global, 'contextId');
+
+// Notify the main process when current context is going to be released.
+// Note that when the renderer process is destroyed, the message may not be
+// sent, we also listen to the "render-view-deleted" event in the main process
+// to guard that situation.
+process.on('exit', () => {
+  const command = IPC_MESSAGES.BROWSER_CONTEXT_RELEASE;
+  ipcRendererInternal.send(command, contextId);
+});
+
+const IS_REMOTE_PROXY = Symbol('is-remote-proxy');
+
+// Convert the arguments object into an array of meta data.
+function wrapArgs (args: any[], visited = new Set()): any {
+  const valueToMeta = (value: any): any => {
+    // Check for circular reference.
+    if (visited.has(value)) {
+      return {
+        type: 'value',
+        value: null
+      };
+    }
+
+    if (value && value.constructor && value.constructor.name === 'NativeImage') {
+      return { type: 'nativeimage', value: serialize(value) };
+    } else if (Array.isArray(value)) {
+      visited.add(value);
+      const meta = {
+        type: 'array',
+        value: wrapArgs(value, visited)
+      };
+      visited.delete(value);
+      return meta;
+    } else if (value instanceof Buffer) {
+      return {
+        type: 'buffer',
+        value
+      };
+    } else if (isSerializableObject(value)) {
+      return {
+        type: 'value',
+        value
+      };
+    } else if (typeof value === 'object') {
+      if (isPromise(value)) {
+        return {
+          type: 'promise',
+          then: valueToMeta(function (onFulfilled: Function, onRejected: Function) {
+            value.then(onFulfilled, onRejected);
+          })
+        };
+      } else if (electronIds.has(value)) {
+        return {
+          type: 'remote-object',
+          id: electronIds.get(value)
+        };
+      }
+
+      const meta: MetaTypeFromRenderer = {
+        type: 'object',
+        name: value.constructor ? value.constructor.name : '',
+        members: []
+      };
+      visited.add(value);
+      for (const prop in value) { // eslint-disable-line guard-for-in
+        meta.members.push({
+          name: prop,
+          value: valueToMeta(value[prop])
+        });
+      }
+      visited.delete(value);
+      return meta;
+    } else if (typeof value === 'function' && isReturnValue.has(value)) {
+      return {
+        type: 'function-with-return-value',
+        value: valueToMeta(value())
+      };
+    } else if (typeof value === 'function') {
+      return {
+        type: 'function',
+        id: callbacksRegistry.add(value),
+        location: callbacksRegistry.getLocation(value),
+        length: value.length
+      };
+    } else {
+      return {
+        type: 'value',
+        value
+      };
+    }
+  };
+  return args.map(valueToMeta);
+}
+
+// Populate object's members from descriptors.
+// The |ref| will be kept referenced by |members|.
+// This matches |getObjectMembers| in rpc-server.
+function setObjectMembers (ref: any, object: any, metaId: number, members: ObjectMember[]) {
+  if (!Array.isArray(members)) return;
+
+  for (const member of members) {
+    if (Object.prototype.hasOwnProperty.call(object, member.name)) continue;
+
+    const descriptor: PropertyDescriptor = { enumerable: member.enumerable };
+    if (member.type === 'method') {
+      const remoteMemberFunction = function (this: any, ...args: any[]) {
+        let command;
+        if (this && this.constructor === remoteMemberFunction) {
+          command = IPC_MESSAGES.BROWSER_MEMBER_CONSTRUCTOR;
+        } else {
+          command = IPC_MESSAGES.BROWSER_MEMBER_CALL;
+        }
+        const ret = ipcRendererInternal.sendSync(command, contextId, metaId, member.name, wrapArgs(args));
+        return metaToValue(ret);
+      };
+
+      let descriptorFunction = proxyFunctionProperties(remoteMemberFunction, metaId, member.name);
+
+      descriptor.get = () => {
+        descriptorFunction.ref = ref; // The member should reference its object.
+        return descriptorFunction;
+      };
+      // Enable monkey-patch the method
+      descriptor.set = (value) => {
+        descriptorFunction = value;
+        return value;
+      };
+      descriptor.configurable = true;
+    } else if (member.type === 'get') {
+      descriptor.get = () => {
+        const command = IPC_MESSAGES.BROWSER_MEMBER_GET;
+        const meta = ipcRendererInternal.sendSync(command, contextId, metaId, member.name);
+        return metaToValue(meta);
+      };
+
+      if (member.writable) {
+        descriptor.set = (value) => {
+          const args = wrapArgs([value]);
+          const command = IPC_MESSAGES.BROWSER_MEMBER_SET;
+          const meta = ipcRendererInternal.sendSync(command, contextId, metaId, member.name, args);
+          if (meta != null) metaToValue(meta);
+          return value;
+        };
+      }
+    }
+
+    Object.defineProperty(object, member.name, descriptor);
+  }
+}
+
+// Populate object's prototype from descriptor.
+// This matches |getObjectPrototype| in rpc-server.
+function setObjectPrototype (ref: any, object: any, metaId: number, descriptor: ObjProtoDescriptor) {
+  if (descriptor === null) return;
+  const proto = {};
+  setObjectMembers(ref, proto, metaId, descriptor.members);
+  setObjectPrototype(ref, proto, metaId, descriptor.proto);
+  Object.setPrototypeOf(object, proto);
+}
+
+// Wrap function in Proxy for accessing remote properties
+function proxyFunctionProperties (remoteMemberFunction: Function, metaId: number, name: string) {
+  let loaded = false;
+
+  // Lazily load function properties
+  const loadRemoteProperties = () => {
+    if (loaded) return;
+    loaded = true;
+    const command = IPC_MESSAGES.BROWSER_MEMBER_GET;
+    const meta = ipcRendererInternal.sendSync(command, contextId, metaId, name);
+    setObjectMembers(remoteMemberFunction, remoteMemberFunction, meta.id, meta.members);
+  };
+
+  return new Proxy(remoteMemberFunction as any, {
+    set: (target, property, value) => {
+      if (property !== 'ref') loadRemoteProperties();
+      target[property] = value;
+      return true;
+    },
+    get: (target, property) => {
+      if (property === IS_REMOTE_PROXY) return true;
+      if (!Object.prototype.hasOwnProperty.call(target, property)) loadRemoteProperties();
+      const value = target[property];
+      if (property === 'toString' && typeof value === 'function') {
+        return value.bind(target);
+      }
+      return value;
+    },
+    ownKeys: (target) => {
+      loadRemoteProperties();
+      return Object.getOwnPropertyNames(target);
+    },
+    getOwnPropertyDescriptor: (target, property) => {
+      const descriptor = Object.getOwnPropertyDescriptor(target, property);
+      if (descriptor) return descriptor;
+      loadRemoteProperties();
+      return Object.getOwnPropertyDescriptor(target, property);
+    }
+  });
+}
+
+// Convert meta data from browser into real value.
+function metaToValue (meta: MetaType): any {
+  if (meta.type === 'value') {
+    return meta.value;
+  } else if (meta.type === 'array') {
+    return meta.members.map((member) => metaToValue(member));
+  } else if (meta.type === 'nativeimage') {
+    return deserialize(meta.value);
+  } else if (meta.type === 'buffer') {
+    return Buffer.from(meta.value.buffer, meta.value.byteOffset, meta.value.byteLength);
+  } else if (meta.type === 'promise') {
+    return Promise.resolve({ then: metaToValue(meta.then) });
+  } else if (meta.type === 'error') {
+    return metaToError(meta);
+  } else if (meta.type === 'exception') {
+    if (meta.value.type === 'error') { throw metaToError(meta.value); } else { throw new Error(`Unexpected value type in exception: ${meta.value.type}`); }
+  } else {
+    let ret;
+    if ('id' in meta) {
+      const cached = getCachedRemoteObject(meta.id);
+      if (cached !== undefined) { return cached; }
+    }
+
+    // A shadow class to represent the remote function object.
+    if (meta.type === 'function') {
+      const remoteFunction = function (this: any, ...args: any[]) {
+        let command;
+        if (this && this.constructor === remoteFunction) {
+          command = IPC_MESSAGES.BROWSER_CONSTRUCTOR;
+        } else {
+          command = IPC_MESSAGES.BROWSER_FUNCTION_CALL;
+        }
+        const obj = ipcRendererInternal.sendSync(command, contextId, meta.id, wrapArgs(args));
+        return metaToValue(obj);
+      };
+      ret = remoteFunction;
+    } else {
+      ret = {};
+    }
+
+    setObjectMembers(ret, ret, meta.id, meta.members);
+    setObjectPrototype(ret, ret, meta.id, meta.proto);
+    if (ret.constructor && (ret.constructor as any)[IS_REMOTE_PROXY]) {
+      Object.defineProperty(ret.constructor, 'name', { value: meta.name });
+    }
+
+    // Track delegate obj's lifetime & tell browser to clean up when object is GCed.
+    electronIds.set(ret, meta.id);
+    setCachedRemoteObject(meta.id, ret);
+    return ret;
+  }
+}
+
+function metaToError (meta: { type: 'error', value: any, members: ObjectMember[] }) {
+  const obj = meta.value;
+  for (const { name, value } of meta.members) {
+    obj[name] = metaToValue(value);
+  }
+  return obj;
+}
+
+function handleMessage (channel: string, handler: Function) {
+  ipcRendererInternal.on(channel, (event, passedContextId, id, ...args) => {
+    if (passedContextId === contextId) {
+      handler(id, ...args);
+    } else {
+      // Message sent to an un-exist context, notify the error to main process.
+      ipcRendererInternal.send(IPC_MESSAGES.BROWSER_WRONG_CONTEXT_ERROR, contextId, passedContextId, id);
+    }
+  });
+}
+
+const enableStacks = hasSwitch('enable-api-filtering-logging');
+
+function getCurrentStack (): string | undefined {
+  const target = { stack: undefined as string | undefined };
+  if (enableStacks) {
+    Error.captureStackTrace(target, getCurrentStack);
+  }
+  return target.stack;
+}
+
+// Browser calls a callback in renderer.
+handleMessage(IPC_MESSAGES.RENDERER_CALLBACK, (id: number, args: any) => {
+  callbacksRegistry.apply(id, metaToValue(args));
+});
+
+// A callback in browser is released.
+handleMessage(IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, (id: number) => {
+  callbacksRegistry.remove(id);
+});
+
+exports.require = (module: string) => {
+  const command = IPC_MESSAGES.BROWSER_REQUIRE;
+  const meta = ipcRendererInternal.sendSync(command, contextId, module, getCurrentStack());
+  return metaToValue(meta);
+};
+
+// Alias to remote.require('electron').xxx.
+export function getBuiltin (module: string) {
+  const command = IPC_MESSAGES.BROWSER_GET_BUILTIN;
+  const meta = ipcRendererInternal.sendSync(command, contextId, module, getCurrentStack());
+  return metaToValue(meta);
+}
+
+export function getCurrentWindow (): BrowserWindow {
+  const command = IPC_MESSAGES.BROWSER_GET_CURRENT_WINDOW;
+  const meta = ipcRendererInternal.sendSync(command, contextId, getCurrentStack());
+  return metaToValue(meta);
+}
+
+// Get current WebContents object.
+export function getCurrentWebContents (): WebContents {
+  const command = IPC_MESSAGES.BROWSER_GET_CURRENT_WEB_CONTENTS;
+  const meta = ipcRendererInternal.sendSync(command, contextId, getCurrentStack());
+  return metaToValue(meta);
+}
+
+// Get a global object in browser.
+export function getGlobal<T = any> (name: string): T {
+  const command = IPC_MESSAGES.BROWSER_GET_GLOBAL;
+  const meta = ipcRendererInternal.sendSync(command, contextId, name, getCurrentStack());
+  return metaToValue(meta);
+}
+
+// Get the process object in browser.
+Object.defineProperty(exports, 'process', {
+  get: () => exports.getGlobal('process')
+});
+
+// Create a function that will return the specified value when called in browser.
+export function createFunctionWithReturnValue<T> (returnValue: T): () => T {
+  const func = () => returnValue;
+  isReturnValue.add(func);
+  return func;
+}
+
+const addBuiltinProperty = (name: string) => {
+  Object.defineProperty(exports, name, {
+    get: () => exports.getBuiltin(name)
+  });
+};
+
+const browserModules = commonModuleList.concat(browserModuleNames.map(name => ({ name, loader: () => {} })));
+
+// And add a helper receiver for each one.
+browserModules
+  .filter((m) => !m.private)
+  .map((m) => m.name)
+  .forEach(addBuiltinProperty);

lib/renderer/api/web-frame.ts

@@ -1,3 +1,84 @@
-const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
+import { EventEmitter } from 'events';
+import deprecate from '@electron/internal/common/api/deprecate';
 
-export default mainFrame;
+const binding = process._linkedBinding('electron_renderer_web_frame');
+
+class WebFrame extends EventEmitter {
+  constructor (public context: Window) {
+    super();
+
+    // Lots of webview would subscribe to webFrame's events.
+    this.setMaxListeners(0);
+  }
+
+  findFrameByRoutingId (...args: Array<any>) {
+    return getWebFrame(binding._findFrameByRoutingId(this.context, ...args));
+  }
+
+  getFrameForSelector (...args: Array<any>) {
+    return getWebFrame(binding._getFrameForSelector(this.context, ...args));
+  }
+
+  findFrameByName (...args: Array<any>) {
+    return getWebFrame(binding._findFrameByName(this.context, ...args));
+  }
+
+  get opener () {
+    return getWebFrame(binding._getOpener(this.context));
+  }
+
+  get parent () {
+    return getWebFrame(binding._getParent(this.context));
+  }
+
+  get top () {
+    return getWebFrame(binding._getTop(this.context));
+  }
+
+  get firstChild () {
+    return getWebFrame(binding._getFirstChild(this.context));
+  }
+
+  get nextSibling () {
+    return getWebFrame(binding._getNextSibling(this.context));
+  }
+
+  get routingId () {
+    return binding._getRoutingId(this.context);
+  }
+}
+
+const contextIsolation = binding.getWebPreference(window, 'contextIsolation');
+const worldSafeExecuteJavaScript = binding.getWebPreference(window, 'worldSafeExecuteJavaScript');
+
+const worldSafeJS = worldSafeExecuteJavaScript || !contextIsolation;
+
+// Populate the methods.
+for (const name in binding) {
+  if (!name.startsWith('_')) { // some methods are manually populated above
+    // TODO(felixrieseberg): Once we can type web_frame natives, we could
+    // use a neat `keyof` here
+    (WebFrame as any).prototype[name] = function (...args: Array<any>) {
+      if (!worldSafeJS && name.startsWith('executeJavaScript')) {
+        deprecate.log(`Security Warning: webFrame.${name} was called without worldSafeExecuteJavaScript enabled. This is considered unsafe. worldSafeExecuteJavaScript will be enabled by default in Electron 12.`);
+      }
+      return binding[name](this.context, ...args);
+    };
+    // TODO(MarshallOfSound): Remove once the above deprecation is removed
+    if (name.startsWith('executeJavaScript')) {
+      (WebFrame as any).prototype[`_${name}`] = function (...args: Array<any>) {
+        return binding[name](this.context, ...args);
+      };
+    }
+  }
+}
+
+// Helper to return WebFrame or null depending on context.
+// TODO(zcbenz): Consider returning same WebFrame for the same frame.
+function getWebFrame (context: Window) {
+  return context ? new WebFrame(context) : null;
+}
+
+const _webFrame = new WebFrame(window);
+
+export default _webFrame;

lib/renderer/init.ts

@@ -1,11 +1,6 @@
 import * as path from 'path';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
 import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as webFrameInitModule from '@electron/internal/renderer/web-frame-init';
-import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';
-import type * as windowSetupModule from '@electron/internal/renderer/window-setup';
-import type * as securityWarningsModule from '@electron/internal/renderer/security-warnings';
 
 const Module = require('module');
 
@@ -45,6 +40,10 @@ require('@electron/internal/common/init');
 // The global variable will be used by ipc for event dispatching
 const v8Util = process._linkedBinding('electron_common_v8_util');
 
+// Expose process.contextId
+const contextId = v8Util.getHiddenValue<string>(global, 'contextId');
+Object.defineProperty(process, 'contextId', { enumerable: true, value: contextId });
+
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
 const ipcRenderer = require('@electron/internal/renderer/api/ipc-renderer').default;
 
@@ -59,23 +58,28 @@ v8Util.setHiddenValue(global, 'ipcNative', {
   }
 });
 
+process.getProcessMemoryInfo = () => {
+  return ipcRendererInternal.invoke<Electron.ProcessMemoryInfo>(IPC_MESSAGES.BROWSER_GET_PROCESS_MEMORY_INFO);
+};
+
 // Use electron module after everything is ready.
-const { webFrameInit } = require('@electron/internal/renderer/web-frame-init') as typeof webFrameInitModule;
+const { webFrameInit } = require('@electron/internal/renderer/web-frame-init');
 webFrameInit();
 
 // Process command line arguments.
 const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');
-const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
 
-const contextIsolation = mainFrame.getWebPreference('contextIsolation');
-const nodeIntegration = mainFrame.getWebPreference('nodeIntegration');
-const webviewTag = mainFrame.getWebPreference('webviewTag');
-const isHiddenPage = mainFrame.getWebPreference('hiddenPage');
-const usesNativeWindowOpen = mainFrame.getWebPreference('nativeWindowOpen');
-const preloadScript = mainFrame.getWebPreference('preload');
-const preloadScripts = mainFrame.getWebPreference('preloadScripts');
-const guestInstanceId = mainFrame.getWebPreference('guestInstanceId');
-const openerId = mainFrame.getWebPreference('openerId');
+const contextIsolation = getWebPreference(window, 'contextIsolation');
+const nodeIntegration = getWebPreference(window, 'nodeIntegration');
+const webviewTag = getWebPreference(window, 'webviewTag');
+const isHiddenPage = getWebPreference(window, 'hiddenPage');
+const usesNativeWindowOpen = getWebPreference(window, 'nativeWindowOpen');
+const rendererProcessReuseEnabled = getWebPreference(window, 'disableElectronSiteInstanceOverrides');
+const preloadScript = getWebPreference(window, 'preload');
+const preloadScripts = getWebPreference(window, 'preloadScripts');
+const guestInstanceId = getWebPreference(window, 'guestInstanceId') || null;
+const openerId = getWebPreference(window, 'openerId') || null;
 const appPath = hasSwitch('app-path') ? getSwitchValue('app-path') : null;
 
 // The webContents preload script is loaded after the session preload scripts.
@@ -97,14 +101,14 @@ switch (window.location.protocol) {
   }
   default: {
     // Override default web functions.
-    const { windowSetup } = require('@electron/internal/renderer/window-setup') as typeof windowSetupModule;
-    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen);
+    const { windowSetup } = require('@electron/internal/renderer/window-setup');
+    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen, rendererProcessReuseEnabled);
   }
 }
 
 // Load webview tag implementation.
 if (process.isMainFrame) {
-  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init') as typeof webViewInitModule;
+  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init');
   webViewInit(contextIsolation, webviewTag, guestInstanceId);
 }
 
@@ -189,6 +193,6 @@ for (const preloadScript of preloadScripts) {
 
 // Warn about security issues
 if (process.isMainFrame) {
-  const { securityWarnings } = require('@electron/internal/renderer/security-warnings') as typeof securityWarningsModule;
+  const { securityWarnings } = require('@electron/internal/renderer/security-warnings');
   securityWarnings(nodeIntegration);
 }

lib/renderer/ipc-renderer-internal.ts

@@ -4,8 +4,7 @@ const { ipc } = process._linkedBinding('electron_renderer_ipc');
 
 const internal = true;
 
-export const ipcRendererInternal = new EventEmitter() as any as ElectronInternal.IpcRendererInternal;
-
+const ipcRendererInternal = new EventEmitter() as any as ElectronInternal.IpcRendererInternal;
 ipcRendererInternal.send = function (channel, ...args) {
   return ipc.send(internal, channel, args);
 };
@@ -14,6 +13,10 @@ ipcRendererInternal.sendSync = function (channel, ...args) {
   return ipc.sendSync(internal, channel, args);
 };
 
+ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
+  return ipc.sendTo(internal, webContentsId, channel, args);
+};
+
 ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) {
   const { error, result } = await ipc.invoke<T>(internal, channel, args);
   if (error) {
@@ -21,3 +24,5 @@ ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[])
   }
   return result;
 };
+
+export { ipcRendererInternal };

lib/renderer/remote/callbacks-registry.ts

@@ -0,0 +1,59 @@
+export class CallbacksRegistry {
+  private nextId: number = 0
+  private callbacks = new Map<number, Function>()
+  private callbackIds = new WeakMap<Function, number>();
+  private locationInfo = new WeakMap<Function, string>();
+
+  add (callback: Function) {
+    // The callback is already added.
+    let id = this.callbackIds.get(callback);
+    if (id != null) return id;
+
+    id = this.nextId += 1;
+
+    // Capture the location of the function and put it in the ID string,
+    // so that release errors can be tracked down easily.
+    const regexp = /at (.*)/gi;
+    const stackString = (new Error()).stack;
+    if (!stackString) return;
+
+    let filenameAndLine: string;
+    let match;
+
+    while ((match = regexp.exec(stackString)) !== null) {
+      const location = match[1];
+      if (location.includes('(native)')) continue;
+      if (location.includes('(<anonymous>)')) continue;
+      if (location.includes('electron/js2c')) continue;
+
+      const ref = /([^/^)]*)\)?$/gi.exec(location);
+      if (ref) filenameAndLine = ref![1];
+      break;
+    }
+
+    this.callbacks.set(id, callback);
+    this.callbackIds.set(callback, id);
+    this.locationInfo.set(callback, filenameAndLine!);
+    return id;
+  }
+
+  get (id: number) {
+    return this.callbacks.get(id) || function () {};
+  }
+
+  getLocation (callback: Function) {
+    return this.locationInfo.get(callback);
+  }
+
+  apply (id: number, ...args: any[]) {
+    return this.get(id).apply(global, ...args);
+  }
+
+  remove (id: number) {
+    const callback = this.callbacks.get(id);
+    if (callback) {
+      this.callbackIds.delete(callback);
+      this.callbacks.delete(id);
+    }
+  }
+}

lib/renderer/security-warnings.ts

@@ -78,7 +78,8 @@ const isLocalhost = function () {
  * @returns {boolean} Is a CSP with `unsafe-eval` set?
  */
 const isUnsafeEvalEnabled: () => Promise<boolean> = function () {
-  return webFrame.executeJavaScript(`(${(() => {
+  // Call _executeJavaScript to bypass the world-safe deprecation warning
+  return webFrame._executeJavaScript(`(${(() => {
     try {
       eval(window.trustedTypes.emptyScript); // eslint-disable-line no-eval
     } catch {
@@ -103,10 +104,14 @@ const warnAboutInsecureResources = function () {
     return;
   }
 
+  const isLocal = (url: URL): boolean =>
+    ['localhost', '127.0.0.1', '[::1]', ''].includes(url.hostname);
+  const isInsecure = (url: URL): boolean =>
+    ['http:', 'ftp:'].includes(url.protocol) && !isLocal(url);
+
   const resources = window.performance
     .getEntriesByType('resource')
-    .filter(({ name }) => /^(http|ftp):/gi.test(name || ''))
-    .filter(({ name }) => new URL(name).hostname !== 'localhost')
+    .filter(({ name }) => isInsecure(new URL(name)))
     .map(({ name }) => `- ${name}`)
     .join('\n');
 
@@ -265,6 +270,25 @@ const warnAboutAllowedPopups = function () {
 //   #13 Disable or limit creation of new windows
 //   #14 Do not use `openExternal` with untrusted content
 
+// #15 on the checklist: Disable the `remote` module
+// Logs a warning message about the remote module
+
+const warnAboutRemoteModuleWithRemoteContent = function (webPreferences?: Electron.WebPreferences) {
+  if (!webPreferences || !webPreferences.enableRemoteModule || isLocalhost()) return;
+
+  if (getIsRemoteProtocol()) {
+    const warning = `This renderer process has "enableRemoteModule" enabled
+    and attempted to load remote content from '${window.location}'. This
+    exposes users of this app to unnecessary security risks.\n${moreInformation}`;
+
+    console.warn('%cElectron Security Warning (enableRemoteModule)',
+      'font-weight: bold;', warning);
+  }
+};
+
+// Currently missing since we can't easily programmatically check for it:
+//   #16 Filter the `remote` module
+
 const logSecurityWarnings = function (
   webPreferences: Electron.WebPreferences | undefined, nodeIntegration: boolean
 ) {
@@ -276,6 +300,9 @@ const logSecurityWarnings = function (
   warnAboutEnableBlinkFeatures(webPreferences);
   warnAboutInsecureCSP();
   warnAboutAllowedPopups();
+  if (BUILDFLAG(ENABLE_REMOTE_MODULE)) {
+    warnAboutRemoteModuleWithRemoteContent(webPreferences);
+  }
 };
 
 const getWebPreferences = async function () {
@@ -286,7 +313,7 @@ const getWebPreferences = async function () {
   }
 };
 
-export function securityWarnings (nodeIntegration = false) {
+export function securityWarnings (nodeIntegration: boolean) {
   const loadHandler = async function () {
     if (shouldLogSecurityWarnings()) {
       const webPreferences = await getWebPreferences();

lib/renderer/web-frame-init.ts

@@ -13,6 +13,11 @@ export const webFrameInit = () => {
   ipcRendererUtils.handle(IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, (
     event, method: keyof WebFrameMethod, ...args: any[]
   ) => {
+    // TODO(MarshallOfSound): Remove once the world-safe-execute-javascript deprecation warning is removed
+    if (method.startsWith('executeJavaScript')) {
+      return (webFrame as any)[`_${method}`](...args);
+    }
+
     // The TypeScript compiler cannot handle the sheer number of
     // call signatures here and simply gives up. Incorrect invocations
     // will be caught by "keyof WebFrameMethod" though.

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

@@ -1,22 +1,20 @@
+import { webFrame } from 'electron';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import { webViewEvents } from '@electron/internal/common/web-view-events';
+
+import { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');
-
-export interface GuestViewDelegate {
-  dispatchEvent (eventName: string, props: Record<string, any>): void;
-  reset(): void;
-}
-
 const DEPRECATED_EVENTS: Record<string, string> = {
   'page-title-updated': 'page-title-set'
 } as const;
 
-const dispatchEvent = function (delegate: GuestViewDelegate, eventName: string, eventKey: string, ...args: Array<any>) {
+const dispatchEvent = function (
+  webView: WebViewImpl, eventName: string, eventKey: string, ...args: Array<any>
+) {
   if (DEPRECATED_EVENTS[eventName] != null) {
-    dispatchEvent(delegate, DEPRECATED_EVENTS[eventName], eventKey, ...args);
+    dispatchEvent(webView, DEPRECATED_EVENTS[eventName], eventKey, ...args);
   }
 
   const props: Record<string, any> = {};
@@ -24,21 +22,28 @@ const dispatchEvent = function (delegate: GuestViewDelegate, eventName: string,
     props[prop] = args[index];
   });
 
-  delegate.dispatchEvent(eventName, props);
+  webView.dispatchEvent(eventName, props);
+
+  if (eventName === 'load-commit') {
+    webView.onLoadCommit(props);
+  } else if (eventName === 'focus-change') {
+    webView.onFocusChange();
+  }
 };
 
-export function registerEvents (viewInstanceId: number, delegate: GuestViewDelegate) {
+export function registerEvents (webView: WebViewImpl, viewInstanceId: number) {
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`, function () {
-    delegate.reset();
-    delegate.dispatchEvent('destroyed', {});
+    webView.guestInstanceId = undefined;
+    webView.reset();
+    webView.dispatchEvent('destroyed');
   });
 
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`, function (event, eventName, ...args) {
-    dispatchEvent(delegate, eventName, eventName, ...args);
+    dispatchEvent(webView, eventName, eventName, ...args);
   });
 
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_IPC_MESSAGE}-${viewInstanceId}`, function (event, channel, ...args) {
-    delegate.dispatchEvent('ipc-message', { channel, args });
+    webView.dispatchEvent('ipc-message', { channel, args });
   });
 }
 
@@ -52,39 +57,23 @@ export function createGuest (params: Record<string, any>): Promise<number> {
   return ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_CREATE_GUEST, params);
 }
 
-export function attachGuest (iframe: HTMLIFrameElement, elementInstanceId: number, guestInstanceId: number, params: Record<string, any>) {
-  if (!(iframe instanceof HTMLIFrameElement)) {
-    throw new Error('Invalid embedder frame');
-  }
-
-  const embedderFrameId = webFrame.getWebFrameId(iframe.contentWindow!);
+export function attachGuest (
+  elementInstanceId: number, guestInstanceId: number, params: Record<string, any>, contentWindow: Window
+) {
+  const embedderFrameId = webFrame.getWebFrameId(contentWindow);
   if (embedderFrameId < 0) { // this error should not happen.
     throw new Error('Invalid embedder frame');
   }
-
-  return ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_ATTACH_GUEST, embedderFrameId, elementInstanceId, guestInstanceId, params);
+  ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_ATTACH_GUEST, embedderFrameId, elementInstanceId, guestInstanceId, params);
 }
 
 export function detachGuest (guestInstanceId: number) {
   return ipcRendererUtils.invokeSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_DETACH_GUEST, guestInstanceId);
 }
 
-export function capturePage (guestInstanceId: number, args: any[]) {
-  return ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_CAPTURE_PAGE, guestInstanceId, args);
-}
-
-export function invoke (guestInstanceId: number, method: string, args: any[]) {
-  return ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, guestInstanceId, method, args);
-}
-
-export function invokeSync (guestInstanceId: number, method: string, args: any[]) {
-  return ipcRendererUtils.invokeSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, guestInstanceId, method, args);
-}
-
-export function propertyGet (guestInstanceId: number, name: string) {
-  return ipcRendererUtils.invokeSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_PROPERTY_GET, guestInstanceId, name);
-}
-
-export function propertySet (guestInstanceId: number, name: string, value: any) {
-  return ipcRendererUtils.invokeSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_PROPERTY_SET, guestInstanceId, name, value);
-}
+export const guestViewInternalModule = {
+  deregisterEvents,
+  createGuest,
+  attachGuest,
+  detachGuest
+};

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

@@ -1,8 +1,15 @@
-import type { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl';
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
+import { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl';
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+
+// Helper function to resolve url set in attribute.
+const a = document.createElement('a');
 
 const resolveURL = function (url?: string | null) {
-  return url ? new URL(url, location.href).href : '';
+  if (!url) return '';
+  a.href = url;
+  return a.href;
 };
 
 interface MutationHandler {
@@ -186,7 +193,11 @@ export class SrcAttribute extends WebViewAttribute {
       opts.userAgent = useragent;
     }
 
-    (this.webViewImpl.webviewNode as Electron.WebviewTag).loadURL(this.getValue(), opts);
+    const guestInstanceId = this.webViewImpl.guestInstanceId;
+    const method = 'loadURL';
+    const args = [this.getValue(), opts];
+
+    ipcRendererInternal.invoke(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, guestInstanceId, method, args);
   }
 }
 
@@ -248,21 +259,34 @@ class WebPreferencesAttribute extends WebViewAttribute {
   }
 }
 
-// Sets up all of the webview attributes.
-export function setupWebViewAttributes (self: WebViewImpl) {
-  return new Map<string, WebViewAttribute>([
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION, new PartitionAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC, new SrcAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER, new HttpReferrerAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT, new UserAgentAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD, new PreloadAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES, new BlinkFeaturesAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES, new DisableBlinkFeaturesAttribute(self)],
-    [WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES, new WebPreferencesAttribute(self)]
-  ]);
+class EnableRemoteModuleAttribute extends WebViewAttribute {
+  constructor (webViewImpl: WebViewImpl) {
+    super(WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE, webViewImpl);
+  }
+
+  public getValue () {
+    return this.webViewImpl.webviewNode.getAttribute(this.name) !== 'false';
+  }
+
+  public setValue (value: any) {
+    this.webViewImpl.webviewNode.setAttribute(this.name, value ? 'true' : 'false');
+  }
 }
+
+// Sets up all of the webview attributes.
+WebViewImpl.prototype.setupWebViewAttributes = function () {
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION, new PartitionAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC, new SrcAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER, new HttpReferrerAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT, new UserAgentAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE, new EnableRemoteModuleAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD, new PreloadAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES, new BlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES, new DisableBlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES, new WebPreferencesAttribute(this));
+};