Bump v10.0.0-beta.24

Co-authored-by: Cheng Zhao <zcbenz@gmail.com>

.circleci/config.yml

@@ -313,12 +313,15 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         sudo rm -rf /Library/Developer/CoreSimulator
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform
-        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/AppleTVOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/iPhoneOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/WatchOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/WatchSimulator.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/AppleTVSimulator.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/iPhoneSimulator.platform
+        sudo rm -rf ~/.rubies
+        sudo rm -rf ~/Library/Caches/Homebrew
+        sudo rm -rf /usr/local/Homebrew
       fi
 
 # On macOS delete all .git directories under src/ expect for
@@ -707,12 +710,11 @@ step-hunspell-store: &step-hunspell-store
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:
     name: Generate breakpad symbols
+    no_output_timeout: 30m
     command: |
       if [ "$GENERATE_SYMBOLS" == "true" ]; then
         cd src
         ninja -C out/Default electron:electron_symbols
-        cd out/Default/breakpad_symbols
-        find . -name \*.sym -print0 | xargs -0 npx @sentry/cli@1.51.1 difutil bundle-sources
       fi
 
 step-maybe-zip-symbols: &step-maybe-zip-symbols
@@ -1042,8 +1044,8 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
-    - *step-get-more-space-on-mac
     - *step-install-gnutar-on-mac
+    - *step-get-more-space-on-mac
     - *step-generate-deps-hash
     - *step-touch-sync-done
     - maybe-restore-portaled-src-cache

.eslintrc.json

@@ -31,7 +31,8 @@
     "BUILDFLAG": "readonly",
     "ENABLE_DESKTOP_CAPTURER": "readonly",
     "ENABLE_REMOTE_MODULE": "readonly",
-    "ENABLE_VIEWS_API": "readonly"
+    "ENABLE_VIEWS_API": "readonly",
+    "BigInt": "readonly"
   },
   "overrides": [
     {

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] relevant documentation is changed or added
 - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).
-- [ ] This is **NOT A BREAKING CHANGE**. Breaking changes may not be merged to master until 11-x-y is branched.
 
 #### Release Notes
 

BUILD.gn

@@ -347,7 +347,6 @@ source_set("electron_lib") {
     "//device/bluetooth",
     "//device/bluetooth/public/cpp",
     "//gin",
-    "//media/blink:blink",
     "//media/capture/mojom:video_capture",
     "//media/mojo/mojom",
     "//net:extras",
@@ -363,6 +362,7 @@ source_set("electron_lib") {
     "//services/viz/privileged/mojom/compositing",
     "//skia",
     "//third_party/blink/public:blink",
+    "//third_party/blink/public:blink_devtools_inspector_resources",
     "//third_party/boringssl",
     "//third_party/electron_node:node_lib",
     "//third_party/inspector_protocol:crdtp",
@@ -602,6 +602,15 @@ source_set("electron_lib") {
     ]
   }
 
+  if (enable_remote_module) {
+    sources += [
+      "shell/common/api/remote/remote_callback_freer.cc",
+      "shell/common/api/remote/remote_callback_freer.h",
+      "shell/common/api/remote/remote_object_freer.cc",
+      "shell/common/api/remote/remote_object_freer.h",
+    ]
+  }
+
   if (enable_desktop_capturer) {
     if (is_component_build && !is_linux) {
       # On windows the implementation relies on unexported

DEPS

@@ -8,14 +8,15 @@ gclient_gn_args = [
   'checkout_pgo_profiles',
   'checkout_oculus_sdk',
   'checkout_openxr',
-  'checkout_google_benchmark'
+  'checkout_google_benchmark',
+  'mac_xcode_version',
 ]
 
 vars = {
   'chromium_version':
-    '9ae03ef8f7d4f6ac663f725bcfe70311987652f3',
+    '85.0.4183.78',
   'node_version':
-    'v12.18.1',
+    'v12.16.3',
   'nan_version':
     '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
 
@@ -51,6 +52,8 @@ vars = {
   # Python "requests" module is used for releases only.
   'checkout_requests': False,
 
+  'mac_xcode_version': 'default',
+
   # To allow running hooks without parsing the DEPS tree
   'process_deps': True,
 

ELECTRON_VERSION

@@ -1 +1 @@
-11.0.0-nightly.20200624
+10.0.0-beta.24

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electron-16-core
-image: vs2019bt-16.4.0
+image: vs2019bt-16.6.2
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default

chromium_src/BUILD.gn

@@ -93,6 +93,14 @@ static_library("chrome") {
     ]
   }
 
+  if (is_win) {
+    sources += [
+      "//chrome/browser/win/icon_reader_service.cc",
+      "//chrome/browser/win/icon_reader_service.h",
+    ]
+    public_deps += [ "//chrome/services/util_win:lib" ]
+  }
+
   if (enable_desktop_capturer) {
     sources += [
       "//chrome/browser/media/webrtc/desktop_media_list.h",
@@ -153,13 +161,6 @@ static_library("chrome") {
     }
   }
 
-  if (enable_tts) {
-    sources += [
-      "//chrome/browser/speech/tts_controller_delegate_impl.cc",
-      "//chrome/browser/speech/tts_controller_delegate_impl.h",
-    ]
-  }
-
   if (enable_widevine) {
     sources += [
       "//chrome/renderer/media/chrome_key_systems.cc",

default_app/main.ts

@@ -1,9 +1,8 @@
-import * as electron from 'electron';
+import { app, dialog } from 'electron';
 
 import * as fs from 'fs';
 import * as path from 'path';
 import * as url from 'url';
-const { app, dialog } = electron;
 
 type DefaultAppOptions = {
   file: null | string;
@@ -146,90 +145,13 @@ function startRepl () {
     process.exit(1);
   }
 
-  // Prevent quitting.
+  // prevent quitting
   app.on('window-all-closed', () => {});
 
-  const GREEN = '32';
-  const colorize = (color: string, s: string) => `\x1b[${color}m${s}\x1b[0m`;
-  const electronVersion = colorize(GREEN, `v${process.versions.electron}`);
-  const nodeVersion = colorize(GREEN, `v${process.versions.node}`);
-
-  console.info(`
-    Welcome to the Electron.js REPL \\[._.]/
-
-    You can access all Electron.js modules here as well as Node.js modules.
-    Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
-  `);
-
-  const { REPLServer } = require('repl');
-  const repl = new REPLServer({
-    prompt: '> '
-  }).on('exit', () => {
+  const repl = require('repl');
+  repl.start('> ').on('exit', () => {
     process.exit(0);
   });
-
-  function defineBuiltin (context: any, name: string, getter: Function) {
-    const setReal = (val: any) => {
-      // Deleting the property before re-assigning it disables the
-      // getter/setter mechanism.
-      delete context[name];
-      context[name] = val;
-    };
-
-    Object.defineProperty(context, name, {
-      get: () => {
-        const lib = getter();
-
-        delete context[name];
-        Object.defineProperty(context, name, {
-          get: () => lib,
-          set: setReal,
-          configurable: true,
-          enumerable: false
-        });
-
-        return lib;
-      },
-      set: setReal,
-      configurable: true,
-      enumerable: false
-    });
-  }
-
-  defineBuiltin(repl.context, 'electron', () => electron);
-  for (const api of Object.keys(electron) as (keyof typeof electron)[]) {
-    defineBuiltin(repl.context, api, () => electron[api]);
-  }
-
-  // Copied from node/lib/repl.js. For better DX, we don't want to
-  // show e.g 'contentTracing' at a higher priority than 'const', so
-  // we only trigger custom tab-completion when no common words are
-  // potentially matches.
-  const commonWords = [
-    'async', 'await', 'break', 'case', 'catch', 'const', 'continue',
-    'debugger', 'default', 'delete', 'do', 'else', 'export', 'false',
-    'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'let',
-    'new', 'null', 'return', 'switch', 'this', 'throw', 'true', 'try',
-    'typeof', 'var', 'void', 'while', 'with', 'yield'
-  ];
-
-  const electronBuiltins = [...Object.keys(electron), 'original-fs', 'electron'];
-
-  const defaultComplete = repl.completer;
-  repl.completer = (line: string, callback: Function) => {
-    const lastSpace = line.lastIndexOf(' ');
-    const currentSymbol = line.substring(lastSpace + 1, repl.cursor);
-
-    const filterFn = (c: string) => c.startsWith(currentSymbol);
-    const ignores = commonWords.filter(filterFn);
-    const hits = electronBuiltins.filter(filterFn);
-
-    if (!ignores.length && hits.length) {
-      callback(null, [hits, currentSymbol]);
-    } else {
-      defaultComplete.apply(repl, [line, callback]);
-    }
-  };
 }
 
 // Start the specified app if there is one specified in command line, otherwise

docs/README.md

@@ -92,6 +92,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
   * [Versioning Policy](tutorial/electron-versioning.md)
   * [Release Timelines](tutorial/electron-timelines.md)
+  * [App Feedback Program](tutorial/app-feedback-program.md)
 * [Packaging App Source Code with asar](tutorial/application-packaging.md)
   * [Generating asar Archives](tutorial/application-packaging.md#generating-asar-archives)
   * [Using asar Archives](tutorial/application-packaging.md#using-asar-archives)

docs/api/app.md

@@ -140,16 +140,6 @@ this event, such as launching the application for the first time, attempting
 to re-launch the application when it's already running, or clicking on the
 application's dock or taskbar icon.
 
-### Event: 'did-become-active' _macOS_
-
-Returns:
-
-* `event` Event
-
-Emitted when mac application become active. Difference from `activate` event is
-that `did-become-active` is emitted every time the app becomes active, not only
-when Dock icon is clicked or application is re-launched.
-
 ### Event: 'continue-activity' _macOS_
 
 Returns:
@@ -369,7 +359,7 @@ Returns:
 
 Emitted when the GPU process crashes or is killed.
 
-### Event: 'renderer-process-crashed'
+### Event: 'renderer-process-crashed' _Deprecated_
 
 Returns:
 
@@ -1232,7 +1222,7 @@ Show the app's about panel options. These options can be overridden with `app.se
   * `credits` String (optional) _macOS_ _Windows_ - Credit information.
   * `authors` String[] (optional) _Linux_ - List of app authors.
   * `website` String (optional) _Linux_ - The app's website.
-  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
+  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
 
 Set the about panel options. This will override the values defined in the app's `.plist` file on macOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
 

docs/api/browser-window.md

@@ -348,6 +348,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       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`.  The default
+      is `false`. In Electron 12, the default will be changed 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:** This option is currently
@@ -1123,7 +1126,7 @@ Disable or enable the window.
 
 #### `win.isEnabled()`
 
-Returns Boolean - whether the window is enabled.
+Returns `Boolean` - whether the window is enabled.
 
 #### `win.setSize(width, height[, animate])`
 

docs/api/crash-reporter.md

@@ -156,10 +156,16 @@ parameters in a renderer process will not result in those parameters being sent
 with crashes that occur in other renderer processes or in the main process.
 
 **Note:** Parameters have limits on the length of the keys and values. Key
-names must be no longer than 39 bytes, and values must be no longer than 127
+names must be no longer than 39 bytes, and values must be no longer than 20320
 bytes. Keys with names longer than the maximum will be silently ignored. Key
 values longer than the maximum length will be truncated.
 
+**Note:** On linux values that are longer than 127 bytes will be chunked into
+multiple keys, each 127 bytes in length.  E.g. `addExtraParameter('foo', 'a'.repeat(130))`
+will result in two chunked keys `foo__1` and `foo__2`, the first will contain
+the first 127 bytes and the second will contain the remaining 3 bytes.  On
+your crash reporting backend you should stitch together keys in this format.
+
 ### `crashReporter.removeExtraParameter(key)`
 
 * `key` String - Parameter key, must be no longer than 39 bytes.

docs/api/debugger.md

@@ -52,6 +52,8 @@ Returns:
 * `method` String - Method name.
 * `params` any - Event parameters defined by the 'parameters'
    attribute in the remote debugging protocol.
+* `sessionId` String - Unique identifier of attached debugging session,
+   will match the value sent from `debugger.sendCommand`.
 
 Emitted whenever the debugging target issues an instrumentation event.
 
@@ -74,11 +76,16 @@ Returns `Boolean` - Whether a debugger is attached to the `webContents`.
 
 Detaches the debugger from the `webContents`.
 
-#### `debugger.sendCommand(method[, commandParams])`
+#### `debugger.sendCommand(method[, commandParams, sessionId])`
 
 * `method` String - Method name, should be one of the methods defined by the
    [remote debugging protocol][rdp].
 * `commandParams` any (optional) - JSON object with request parameters.
+* `sessionId` String (optional) - send command to the target with associated
+   debugging session id. The initial value can be obtained by sending
+   [Target.attachToTarget][attachToTarget] message.
+
+[attachToTarget]: https://chromedevtools.github.io/devtools-protocol/tot/Target/#method-attachToTarget
 
 Returns `Promise<any>` - A promise that resolves with the response defined by
 the 'returns' attribute of the command description in the remote debugging protocol

docs/api/desktop-capturer.md

@@ -72,50 +72,6 @@ const constraints = {
 }
 ```
 
-This example shows how to capture a video from a [WebContents](web-contents.md)
-
-```javascript
-// In the renderer process.
-const { desktopCapturer, remote } = require('electron')
-
-desktopCapturer.getMediaSourceIdForWebContents(remote.getCurrentWebContents().id).then(async mediaSourceId => {
-  try {
-    const stream = await navigator.mediaDevices.getUserMedia({
-      audio: {
-        mandatory: {
-          chromeMediaSource: 'tab',
-          chromeMediaSourceId: mediaSourceId
-        }
-      },
-      video: {
-        mandatory: {
-          chromeMediaSource: 'tab',
-          chromeMediaSourceId: mediaSourceId,
-          minWidth: 1280,
-          maxWidth: 1280,
-          minHeight: 720,
-          maxHeight: 720
-        }
-      }
-    })
-    handleStream(stream)
-  } catch (e) {
-    handleError(e)
-  }
-})
-
-function handleStream (stream) {
-  const video = document.querySelector('video')
-  video.srcObject = stream
-  video.onloadedmetadata = (e) => video.play()
-}
-
-function handleError (e) {
-  console.log(e)
-}
-```
-
-
 ## Methods
 
 The `desktopCapturer` module has the following methods:
@@ -138,15 +94,6 @@ Returns `Promise<DesktopCapturerSource[]>` - Resolves with an array of [`Desktop
 **Note** Capturing the screen contents requires user consent on macOS 10.15 Catalina or higher,
 which can detected by [`systemPreferences.getMediaAccessStatus`].
 
-### `desktopCapturer.getMediaSourceIdForWebContents(webContentsId)`
-
-* `webContentsId` number - Id of the WebContents to get stream of
-
-Returns `Promise<string>` - Resolves with the identifier of a WebContents stream, this identifier can be
-used with [`navigator.mediaDevices.getUserMedia`].
-The identifier is **only valid for 10 seconds**.
-The identifier may be empty if not requested from a renderer process.
-
 [`navigator.mediaDevices.getUserMedia`]: https://developer.mozilla.org/en/docs/Web/API/MediaDevices/getUserMedia
 [`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-macos
 

docs/api/protocol.md

@@ -63,8 +63,8 @@ The `protocol` module has the following methods:
 module gets emitted and can be called only once.
 
 Registers the `scheme` as standard, secure, bypasses content security policy for
-resources, allows registering ServiceWorker, supports fetch API, and streaming
-video/audio. Specify a privilege with the value of `true` to enable the capability.
+resources, allows registering ServiceWorker and supports fetch API. Specify a
+privilege with the value of `true` to enable the capability.
 
 An example of registering a privileged scheme, that bypasses Content Security
 Policy:
@@ -103,11 +103,6 @@ cookies) are disabled for non standard schemes. So in general if you want to
 register a custom protocol to replace the `http` protocol, you have to register
 it as a standard scheme.
 
-Protocols that use streams (http and stream protocols) should set `stream: true`.
-The `<video>` and `<audio>` HTML elements expect protocols to buffer their
-responses by default. The `stream` flag configures those elements to correctly
-expect streaming responses.
-
 ### `protocol.registerFileProtocol(scheme, handler)`
 
 * `scheme` String

docs/api/service-workers.md

@@ -39,7 +39,7 @@ Returns:
   * `message` String - The actual console message
   * `versionId` Number - The version ID of the service worker that sent the log message
   * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
-  * `level` Number - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
+  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
   * `sourceUrl` String - The URL the message came from
   * `lineNumber` Number - The line number of the source that triggered this console message
 

docs/api/structures/custom-scheme.md

@@ -8,4 +8,3 @@
   * `allowServiceWorkers` Boolean (optional) - Default false.
   * `supportFetchAPI` Boolean (optional) - Default false.
   * `corsEnabled` Boolean (optional) - Default false.
-  * `stream` Boolean (optional) - Default false.

docs/api/structures/trace-config.md

@@ -6,7 +6,7 @@
 * `trace_buffer_size_in_events` number (optional) - maximum size of the trace
   recording buffer in events.
 * `enable_argument_filter` boolean (optional) - if true, filter event data
-  according to a specific list of events that have been manually vetted to not
+  according to a whitelist of events that have been manually vetted to not
   include any PII. See [the implementation in
   Chromium][trace_event_args_whitelist.cc] for specifics.
 * `included_categories` String[] (optional) - a list of tracing categories to

docs/api/system-preferences.md

@@ -416,7 +416,7 @@ This API itself will not protect your user data; rather, it is a mechanism to al
 
 Returns `Boolean` - `true` if the current process is a trusted accessibility client and `false` if it is not.
 
-### `systemPreferences.getMediaAccessStatus(mediaType)` _macOS_
+### `systemPreferences.getMediaAccessStatus(mediaType)` _Windows_ _macOS_
 
 * `mediaType` String - Can be `microphone`, `camera` or `screen`.
 
@@ -426,6 +426,9 @@ This user consent was not required on macOS 10.13 High Sierra or lower so this m
 macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
 macOS 10.15 Catalina or higher requires consent for `screen` access.
 
+Windows 10 has a global setting controlling `microphone` and `camera` access for all win32 applications.
+It will always return `granted` for `screen` and for all media types on older versions of Windows.
+
 ### `systemPreferences.askForMediaAccess(mediaType)` _macOS_
 
 * `mediaType` String - the type of media being requested; can be `microphone`, `camera`.

docs/api/web-contents.md

@@ -738,9 +738,9 @@ Emitted when a `<webview>` has been attached to this web contents.
 Returns:
 
 * `event` Event
-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String
 
 Emitted when the associated window logs a console message.
@@ -1311,6 +1311,8 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   * `success` Boolean - Indicates success of the print call.
   * `failureReason` String - Error description called back if the print fails.
 
+When a custom `pageSize` is passed, Chromium attempts to validate platform specific minumum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.
+
 Prints window's web page. When `silent` is set to `true`, Electron will pick
 the system's default printer if `deviceName` is empty and the default settings for printing.
 
@@ -1334,13 +1336,12 @@ win.webContents.print(options, (success, errorType) => {
   * `landscape` Boolean (optional) - `true` for landscape, `false` for portrait.
   * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
-    and `width` in microns.
   * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
   * `pageRanges` Record<string, number> (optional) - The page range to print.
     * `from` Number - the first page to print.
     * `to` Number - the last page to print (inclusive).
   * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
   * `printSelectionOnly` Boolean (optional) - Whether to print selection only.
 
@@ -1371,6 +1372,8 @@ An example of `webContents.printToPDF`:
 ```javascript
 const { BrowserWindow } = require('electron')
 const fs = require('fs')
+const path = require('path')
+const os = require('os')
 
 let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')
@@ -1378,12 +1381,13 @@ win.loadURL('http://github.com')
 win.webContents.on('did-finish-load', () => {
   // Use default printing options
   win.webContents.printToPDF({}).then(data => {
-    fs.writeFile('/tmp/print.pdf', data, (error) => {
+    const pdfPath = path.join(os.homedir(), 'Desktop', 'temp.pdf')
+    fs.writeFile(pdfPath, data, (error) => {
       if (error) throw error
-      console.log('Write PDF successfully.')
+      console.log(`Wrote PDF successfully to ${pdfPath}`)
     })
   }).catch(error => {
-    console.log(error)
+    console.log(`Failed to write PDF to ${pdfPath}: `, error)
   })
 })
 ```

docs/api/webview-tag.md

@@ -755,9 +755,9 @@ Fired when page leaves fullscreen triggered by HTML API.
 
 Returns:
 
-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String
 
 Fired when the guest window logs a console message.

docs/development/README.md

@@ -23,3 +23,4 @@ For guides on Electron app development, see
 * [Debugging on macOS](debugging-instructions-macos.md)
 * [Setting Up Symbol Server in Debugger](setting-up-symbol-server.md)
 * [Patches](patches.md)
+* [Upgrading Node](upgrading-node.md)

docs/development/build-instructions-gn.md

@@ -10,10 +10,6 @@ Check the build prerequisites for your platform before proceeding
   * [Linux](build-instructions-linux.md#prerequisites)
   * [Windows](build-instructions-windows.md#prerequisites)
 
-## Build Tools
-
-[Electron's Build Tools](https://github.com/electron/build-tools) automate much of the setup for compiling Electron from source with different configurations and build targets. If you wish to set up the environment manually, the instructions are listed below.
-
 ## GN prerequisites
 
 You'll need to install [`depot_tools`][depot-tools], the toolset

docs/development/upgrading-node.md

@@ -0,0 +1,121 @@
+# Upgrading Node
+
+## Discussion
+
+Chromium and Node.js both depend on V8, and Electron contains
+only a single copy of V8, so it's important to ensure that the
+version of V8 chosen is compatible with the build's version of
+Node.js and Chromium.
+
+Upgrading Node is much easier than upgrading Chromium, so fewer
+conflicts arise if one upgrades Chromium first, then chooses the
+upstream Node release whose version of V8 is closest to the one
+Chromium contains.
+
+Electron has its own [Node fork](https://github.com/electron/node)
+with modifications for the V8 build details mentioned above
+and for exposing API needed by Electron. Once an upstream Node
+release is chosen, it's placed in a branch in Electron's Node fork
+and any Electron Node patches are applied there.
+
+Another factor is that the Node project patches its version of V8.
+As mentioned above, Electron builds everything with a single copy
+of V8, so Node's V8 patches must be ported to that copy.
+
+Once all of Electron's dependencies are building and using the same
+copy of V8, the next step is to fix any Electron code issues caused
+by the Node upgrade.
+
+[FIXME] something about a Node debugger in Atom that we (e.g. deepak)
+use and need to confirm doesn't break with the Node upgrade?
+
+So in short, the primary steps are:
+
+1. Update Electron's Node fork to the desired version
+2. Backport Node's V8 patches to our copy of V8
+3. Update the GN build files, porting changes from node's GYP files
+4. Update Electron's DEPS to use new version of Node
+
+## Updating Electron's Node [fork](https://github.com/electron/node)
+
+1. Ensure that `master` on `electron/node` has updated release tags from `nodejs/node`
+2. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update
+  - `vX.X.X` Must use a version of Node compatible with our current version of Chromium
+3. Re-apply our commits from the previous version of Node we were using (`vY.Y.Y`) to `v.X.X.X`
+  - Check release tag and select the range of commits we need to re-apply
+  - Cherry-pick commit range:
+    1. Checkout both `vY.Y.Y` & `v.X.X.X`
+    2. `git cherry-pick FIRST_COMMIT_HASH..LAST_COMMIT_HASH`
+  - Resolve merge conflicts in each file encountered, then:
+    1. `git add <conflict-file>`
+    2. `git cherry-pick --continue`
+    3. Repeat until finished
+
+
+## Updating [V8](https://github.com/electron/node/src/V8) Patches
+
+We need to generate a patch file from each patch that Node
+applies to V8.
+
+```sh
+$ cd third_party/electron_node
+$ CURRENT_NODE_VERSION=vX.Y.Z
+# Find the last commit with the message "deps: update V8 to <some version>"
+# This commit corresponds to Node resetting V8 to its pristine upstream
+# state at the stated version.
+$ LAST_V8_UPDATE="$(git log --grep='^deps: update V8' --format='%H' -1 deps/v8)"
+# This creates a patch file containing all changes in deps/v8 from
+# $LAST_V8_UPDATE up to the current Node version, formatted in a way that
+# it will apply cleanly to the V8 repository (i.e. with `deps/v8`
+# stripped off the path and excluding the v8/gypfiles directory, which
+# isn't present in V8.
+$ git format-patch \
+    --relative=deps/v8 \
+    $LAST_V8_UPDATE..$CURRENT_NODE_VERSION \
+    deps/v8 \
+    ':(exclude)deps/v8/gypfiles' \
+    --stdout \
+    > ../../electron/common/patches/v8/node_v8_patches.patch
+```
+
+This list of patches will probably include one that claims to
+make the V8 API backwards-compatible with a previous version of
+V8. Unfortunately, those patches almost always change the V8 API
+in a way that is incompatible with Chromium.
+
+It's usually easier to update Node to work without the
+compatibility patch than to update Chromium to work with the
+compatibility patch, so it's recommended to revert the
+compatibility patch and fix any errors that arise when compiling
+Node.
+
+## Update Electron's `DEPS` file
+
+Update the `DEPS` file in the root of
+[electron/electron](https://github.com/electron/electron) to
+point to the git hash of the updated Node.
+
+## Notes
+
+- Node maintains its own fork of V8
+  - They backport a small amount of things as needed
+  - Documentation in Node about how [they work with V8](https://nodejs.org/api/v8.html)
+- We update code such that we only use one copy of V8 across all of Electron
+  - E.g Electron, Chromium, and Node.js
+- We don’t track upstream closely due to logistics:
+   - Upstream uses multiple repos and so merging into a single repo
+   would result in lost history. So we only update when we’re planning
+   a Node version bump in Electron.
+- Chromium is large and time-consuming to update, so we typically
+  choose the Node version based on which of its releases has a version
+  of V8 that’s closest to the version in Chromium that we’re using.
+  - We sometimes have to wait for the next periodic Node release
+   because it will sync more closely with the version of V8 in the new Chromium
+ - Electron keeps all its patches in the repo because it’s simpler than
+   maintaining different repos for patches for each upstream project.
+   - Crashpad, Node.js, Chromium, Skia etc. patches are all kept in the same place
+ - Building Node:
+   - We maintain our own GN build files for Node.js to make it easier to ensure
+     that eevrything is built with the same compiler flags.
+     This means that every time we upgrade Node.js we have to do a modest amount of
+     work to synchronize the GN files with the upstream GYP files.

docs/tutorial/app-feedback-program.md

@@ -0,0 +1,3 @@
+# Electron App Feedback Program
+
+Electron is working on building a streamlined release process and having faster releases. To help with that, we have the App Feedback Program for large-scale Electron apps to test our beta releases and report app-specific issues to the Electron team. We use this program to help us prioritize work and get applications upgraded to the next stable release as soon as possible. There are a few requirements we expect from participants, such as attending short, online weekly check-ins. Please visit the [blog post](https://electronjs.org/blog/app-feedback-program) for details and sign-up.

docs/tutorial/first-app.md

@@ -44,10 +44,23 @@ run the main process. An example of your `package.json` might look like this:
 ```
 
 __Note__: If the `main` field is not present in `package.json`, Electron will
-attempt to load an `index.js` (as Node.js does).
+attempt to load an `index.js` (as Node.js does). If this was actually
+a simple Node application, you would add a `start` script that instructs `node`
+to execute the current package:
 
-By default, `npm start` would run the main script with Node.js. in order to make
-it run with Electron, you can add a `start` script:
+```json
+{
+  "name": "your-app",
+  "version": "0.1.0",
+  "main": "main.js",
+  "scripts": {
+    "start": "node ."
+  }
+}
+```
+
+Turning this Node application into an Electron application is quite simple - we
+merely replace the `node` runtime with the `electron` runtime.
 
 ```json
 {
@@ -141,10 +154,10 @@ function createWindow () {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(createWindow)
 
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
+// Quit when all windows are closed.
 app.on('window-all-closed', () => {
+  // On macOS it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
   if (process.platform !== 'darwin') {
     app.quit()
   }

electron_paks.gni

@@ -63,6 +63,7 @@ template("electron_extra_paks") {
       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
+      "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
       "$root_gen_dir/ui/resources/webui_resources.pak",
       "$target_gen_dir/electron_resources.pak",
     ]
@@ -76,6 +77,7 @@ template("electron_extra_paks") {
       "//electron:resources",
       "//mojo/public/js:resources",
       "//net:net_resources",
+      "//third_party/blink/public:devtools_inspector_resources",
       "//third_party/blink/public:resources",
       "//ui/resources",
     ]

electron_strings.grdp

@@ -75,4 +75,9 @@
   <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
     en-US,en
   </message>
+  <if expr="is_win">
+    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
+      Windows Utilities
+    </message>
+  </if>
 </grit-part>

filenames.auto.gni

@@ -135,12 +135,13 @@ auto_filenames = {
 
   sandbox_bundle_deps = [
     "lib/browser/api/module-names.ts",
-    "lib/common/api/clipboard.ts",
+    "lib/common/api/clipboard.js",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
-    "lib/common/api/native-image.ts",
-    "lib/common/api/shell.ts",
+    "lib/common/api/native-image.js",
+    "lib/common/api/shell.js",
     "lib/common/define-properties.ts",
+    "lib/common/electron-binding-setup.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-methods.ts",
     "lib/common/webpack-globals-provider.ts",
@@ -148,7 +149,7 @@ auto_filenames = {
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/ipc-renderer.ts",
-    "lib/renderer/api/remote.ts",
+    "lib/renderer/api/remote.js",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/inspector.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
@@ -165,23 +166,20 @@ auto_filenames = {
     "lib/renderer/window-setup.ts",
     "lib/sandboxed_renderer/api/exports/electron.ts",
     "lib/sandboxed_renderer/api/module-list.ts",
-    "lib/sandboxed_renderer/init.ts",
+    "lib/sandboxed_renderer/init.js",
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
   ]
 
   isolated_bundle_deps = [
+    "lib/common/electron-binding-setup.ts",
     "lib/isolated_renderer/init.js",
     "lib/renderer/web-view/web-view-constants.ts",
     "lib/renderer/web-view/web-view-element.ts",
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
   ]
 
   browser_bundle_deps = [
@@ -190,15 +188,15 @@ auto_filenames = {
     "lib/browser/api/auto-updater/auto-updater-native.js",
     "lib/browser/api/auto-updater/auto-updater-win.js",
     "lib/browser/api/auto-updater/squirrel-update-win.js",
-    "lib/browser/api/browser-view.ts",
+    "lib/browser/api/browser-view.js",
     "lib/browser/api/browser-window.js",
-    "lib/browser/api/content-tracing.ts",
+    "lib/browser/api/content-tracing.js",
     "lib/browser/api/crash-reporter.ts",
     "lib/browser/api/desktop-capturer.ts",
     "lib/browser/api/dialog.js",
     "lib/browser/api/exports/electron.ts",
-    "lib/browser/api/global-shortcut.ts",
-    "lib/browser/api/in-app-purchase.ts",
+    "lib/browser/api/global-shortcut.js",
+    "lib/browser/api/in-app-purchase.js",
     "lib/browser/api/ipc-main.ts",
     "lib/browser/api/menu-item-roles.js",
     "lib/browser/api/menu-item.js",
@@ -209,19 +207,19 @@ auto_filenames = {
     "lib/browser/api/native-theme.ts",
     "lib/browser/api/net-log.js",
     "lib/browser/api/net.ts",
-    "lib/browser/api/notification.ts",
+    "lib/browser/api/notification.js",
     "lib/browser/api/power-monitor.ts",
-    "lib/browser/api/power-save-blocker.ts",
+    "lib/browser/api/power-save-blocker.js",
     "lib/browser/api/protocol.ts",
     "lib/browser/api/screen.ts",
-    "lib/browser/api/session.ts",
+    "lib/browser/api/session.js",
     "lib/browser/api/system-preferences.ts",
     "lib/browser/api/top-level-window.js",
     "lib/browser/api/touch-bar.js",
-    "lib/browser/api/tray.ts",
-    "lib/browser/api/view.ts",
-    "lib/browser/api/views/image-view.ts",
-    "lib/browser/api/web-contents-view.ts",
+    "lib/browser/api/tray.js",
+    "lib/browser/api/view.js",
+    "lib/browser/api/views/image-view.js",
+    "lib/browser/api/web-contents-view.js",
     "lib/browser/api/web-contents.js",
     "lib/browser/chrome-extension-shim.js",
     "lib/browser/default-menu.ts",
@@ -239,12 +237,13 @@ auto_filenames = {
     "lib/browser/remote/server.ts",
     "lib/browser/rpc-server.js",
     "lib/browser/utils.ts",
-    "lib/common/api/clipboard.ts",
+    "lib/common/api/clipboard.js",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
-    "lib/common/api/native-image.ts",
-    "lib/common/api/shell.ts",
+    "lib/common/api/native-image.js",
+    "lib/common/api/shell.js",
     "lib/common/define-properties.ts",
+    "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
     "lib/common/parse-features-string.ts",
     "lib/common/reset-search-paths.ts",
@@ -256,18 +255,17 @@ auto_filenames = {
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
   ]
 
   renderer_bundle_deps = [
     "lib/browser/api/module-names.ts",
-    "lib/common/api/clipboard.ts",
+    "lib/common/api/clipboard.js",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
-    "lib/common/api/native-image.ts",
-    "lib/common/api/shell.ts",
+    "lib/common/api/native-image.js",
+    "lib/common/api/shell.js",
     "lib/common/define-properties.ts",
+    "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
@@ -279,7 +277,7 @@ auto_filenames = {
     "lib/renderer/api/exports/electron.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
-    "lib/renderer/api/remote.ts",
+    "lib/renderer/api/remote.js",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/init.ts",
     "lib/renderer/inspector.ts",
@@ -299,18 +297,17 @@ auto_filenames = {
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
   ]
 
   worker_bundle_deps = [
     "lib/browser/api/module-names.ts",
-    "lib/common/api/clipboard.ts",
+    "lib/common/api/clipboard.js",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
-    "lib/common/api/native-image.ts",
-    "lib/common/api/shell.ts",
+    "lib/common/api/native-image.js",
+    "lib/common/api/shell.js",
     "lib/common/define-properties.ts",
+    "lib/common/electron-binding-setup.ts",
     "lib/common/init.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
@@ -321,7 +318,7 @@ auto_filenames = {
     "lib/renderer/api/exports/electron.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
-    "lib/renderer/api/remote.ts",
+    "lib/renderer/api/remote.js",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
@@ -331,7 +328,5 @@ auto_filenames = {
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
   ]
 }

lib/browser/api/app.ts

@@ -4,8 +4,8 @@ import * as path from 'path';
 import { deprecate, Menu } from 'electron';
 import { EventEmitter } from 'events';
 
-const bindings = process._linkedBinding('electron_browser_app');
-const commandLine = process._linkedBinding('electron_common_command_line');
+const bindings = process.electronBinding('app');
+const commandLine = process.electronBinding('command_line');
 const { app, App } = bindings;
 
 // Only one app object permitted.

lib/browser/api/auto-updater/auto-updater-native.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const EventEmitter = require('events').EventEmitter;
-const { autoUpdater, AutoUpdater } = process._linkedBinding('electron_browser_auto_updater');
+const { autoUpdater, AutoUpdater } = process.electronBinding('auto_updater');
 
 // AutoUpdater is an EventEmitter.
 Object.setPrototypeOf(AutoUpdater.prototype, EventEmitter.prototype);

lib/browser/api/browser-view.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const { EventEmitter } = require('events');
+const { BrowserView } = process.electronBinding('browser_view');
+
+Object.setPrototypeOf(BrowserView.prototype, EventEmitter.prototype);
+
+BrowserView.fromWebContents = (webContents) => {
+  for (const view of BrowserView.getAllViews()) {
+    if (view.webContents.equal(webContents)) return view;
+  }
+
+  return null;
+};
+
+module.exports = BrowserView;

lib/browser/api/browser-view.ts

@@ -1,15 +0,0 @@
-import { EventEmitter } from 'events';
-
-const { BrowserView } = process._linkedBinding('electron_browser_browser_view');
-
-Object.setPrototypeOf(BrowserView.prototype, EventEmitter.prototype);
-
-BrowserView.fromWebContents = (webContents: Electron.WebContents) => {
-  for (const view of BrowserView.getAllViews()) {
-    if (view.webContents.equal(webContents)) return view;
-  }
-
-  return null;
-};
-
-export default BrowserView;

lib/browser/api/browser-window.js

@@ -2,7 +2,7 @@
 
 const electron = require('electron');
 const { TopLevelWindow, deprecate } = electron;
-const { BrowserWindow } = process._linkedBinding('electron_browser_window');
+const { BrowserWindow } = process.electronBinding('window');
 
 Object.setPrototypeOf(BrowserWindow.prototype, TopLevelWindow.prototype);
 
@@ -59,7 +59,7 @@ BrowserWindow.prototype._init = function () {
   }
 
   // Notify the creation of the window.
-  const event = process._linkedBinding('electron_browser_event').createEmpty();
+  const event = process.electronBinding('event').createEmpty();
   app.emit('browser-window-created', event, this);
 
   Object.defineProperty(this, 'devToolsWebContents', {

lib/browser/api/content-tracing.js

@@ -0,0 +1,2 @@
+'use strict';
+module.exports = process.electronBinding('content_tracing');

lib/browser/api/content-tracing.ts

@@ -1 +0,0 @@
-export default process._linkedBinding('electron_browser_content_tracing');

lib/browser/api/crash-reporter.ts

@@ -1,6 +1,6 @@
 import { app, deprecate } from 'electron';
 
-const binding = process._linkedBinding('electron_browser_crash_reporter');
+const binding = process.electronBinding('crash_reporter');
 
 class CrashReporter {
   start (options: Electron.CrashReporterStartOptions) {

lib/browser/api/dialog.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const { app, BrowserWindow, deprecate } = require('electron');
-const binding = process._linkedBinding('electron_browser_dialog');
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const binding = process.electronBinding('dialog');
+const v8Util = process.electronBinding('v8_util');
 
 const DialogType = {
   OPEN: 'OPEN',

lib/browser/api/global-shortcut.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = process.electronBinding('global_shortcut').globalShortcut;

lib/browser/api/global-shortcut.ts

@@ -1,2 +0,0 @@
-const { globalShortcut } = process._linkedBinding('electron_browser_global_shortcut');
-export default globalShortcut;

lib/browser/api/in-app-purchase.js

@@ -1,24 +1,22 @@
-import { EventEmitter } from 'events';
+'use strict';
 
-let _inAppPurchase;
+const { deprecate } = require('electron');
 
 if (process.platform === 'darwin') {
-  const { inAppPurchase, InAppPurchase } = process._linkedBinding('electron_browser_in_app_purchase');
+  const { EventEmitter } = require('events');
+  const { inAppPurchase, InAppPurchase } = process.electronBinding('in_app_purchase');
 
   // inAppPurchase is an EventEmitter.
   Object.setPrototypeOf(InAppPurchase.prototype, EventEmitter.prototype);
   EventEmitter.call(inAppPurchase);
 
-  _inAppPurchase = inAppPurchase;
+  module.exports = inAppPurchase;
 } else {
-  _inAppPurchase = new EventEmitter();
-  Object.assign(_inAppPurchase, {
-    purchaseProduct: () => {
+  module.exports = {
+    purchaseProduct: (productID, quantity, callback) => {
       throw new Error('The inAppPurchase module can only be used on macOS');
     },
     canMakePayments: () => false,
     getReceiptURL: () => ''
-  });
+  };
 }
-
-export default _inAppPurchase;

lib/browser/api/menu.js

@@ -3,8 +3,8 @@
 const { TopLevelWindow, MenuItem, webContents } = require('electron');
 const { sortMenuItems } = require('@electron/internal/browser/api/menu-utils');
 const EventEmitter = require('events').EventEmitter;
-const v8Util = process._linkedBinding('electron_common_v8_util');
-const bindings = process._linkedBinding('electron_browser_menu');
+const v8Util = process.electronBinding('v8_util');
+const bindings = process.electronBinding('menu');
 
 const { Menu } = bindings;
 let applicationMenu = null;

lib/browser/api/message-channel.ts

@@ -1,5 +1,5 @@
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-const { createPair } = process._linkedBinding('electron_browser_message_port');
+const { createPair } = process.electronBinding('message_port');
 
 export default class MessageChannelMain {
   port1: MessagePortMain;

lib/browser/api/native-theme.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 
-const { NativeTheme, nativeTheme } = process._linkedBinding('electron_common_native_theme');
+const { NativeTheme, nativeTheme } = process.electronBinding('native_theme');
 
 Object.setPrototypeOf(NativeTheme.prototype, EventEmitter.prototype);
 EventEmitter.call(nativeTheme as any);

lib/browser/api/net.ts

@@ -2,13 +2,7 @@ import * as url from 'url';
 import { Readable, Writable } from 'stream';
 import { app } from 'electron';
 import { ClientRequestConstructorOptions, UploadProgress } from 'electron/main';
-const {
-  net,
-  Net,
-  isValidHeaderName,
-  isValidHeaderValue,
-  createURLLoader
-} = process._linkedBinding('electron_browser_net');
+const { net, Net, isValidHeaderName, isValidHeaderValue, createURLLoader } = process.electronBinding('net');
 
 const kSupportedProtocols = new Set(['http:', 'https:']);
 

lib/browser/api/notification.js

@@ -0,0 +1,7 @@
+'use strict';
+
+const { Notification, isSupported } = process.electronBinding('notification');
+
+Notification.isSupported = isSupported;
+
+module.exports = Notification;

lib/browser/api/notification.ts

@@ -1,8 +0,0 @@
-const {
-  Notification: ElectronNotification,
-  isSupported
-} = process._linkedBinding('electron_common_notification');
-
-ElectronNotification.isSupported = isSupported;
-
-export default ElectronNotification;

lib/browser/api/power-monitor.ts

@@ -1,11 +1,7 @@
 import { EventEmitter } from 'events';
 import { app } from 'electron';
 
-const {
-  createPowerMonitor,
-  getSystemIdleState,
-  getSystemIdleTime
-} = process._linkedBinding('electron_browser_power_monitor');
+const { createPowerMonitor, getSystemIdleState, getSystemIdleTime } = process.electronBinding('power_monitor');
 
 class PowerMonitor extends EventEmitter {
   constructor () {

lib/browser/api/power-save-blocker.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = process.electronBinding('power_save_blocker').powerSaveBlocker;

lib/browser/api/power-save-blocker.ts

@@ -1,2 +0,0 @@
-const { powerSaveBlocker } = process._linkedBinding('electron_browser_power_save_blocker');
-export default powerSaveBlocker;

lib/browser/api/protocol.ts

@@ -1,7 +1,7 @@
 import { app, session } from 'electron';
 
 // Global protocol APIs.
-const protocol = process._linkedBinding('electron_browser_protocol');
+const protocol = process.electronBinding('protocol');
 
 // Fallback protocol APIs of default session.
 Object.setPrototypeOf(protocol, new Proxy({}, {

lib/browser/api/screen.ts

@@ -2,7 +2,7 @@
 
 import { createLazyInstance } from '../utils';
 const { EventEmitter } = require('events');
-const { Screen, createScreen } = process._linkedBinding('electron_common_screen');
+const { Screen, createScreen } = process.electronBinding('screen');
 
 // Screen is an EventEmitter.
 Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype);

lib/browser/api/session.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const { EventEmitter } = require('events');
+const { app, deprecate } = require('electron');
+const { fromPartition } = process.electronBinding('session');
+
+// Public API.
+Object.defineProperties(exports, {
+  defaultSession: {
+    enumerable: true,
+    get () { return fromPartition(''); }
+  },
+  fromPartition: {
+    enumerable: true,
+    value: fromPartition
+  }
+});

lib/browser/api/session.ts

@@ -1,8 +0,0 @@
-const { fromPartition } = process._linkedBinding('electron_browser_session');
-
-export default {
-  fromPartition,
-  get defaultSession () {
-    return fromPartition('');
-  }
-};

lib/browser/api/system-preferences.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { deprecate } from 'electron';
-const { systemPreferences, SystemPreferences } = process._linkedBinding('electron_browser_system_preferences');
+const { systemPreferences, SystemPreferences } = process.electronBinding('system_preferences');
 
 // SystemPreferences is an EventEmitter.
 Object.setPrototypeOf(SystemPreferences.prototype, EventEmitter.prototype);

lib/browser/api/top-level-window.js

@@ -2,7 +2,7 @@
 
 const electron = require('electron');
 const { EventEmitter } = require('events');
-const { TopLevelWindow } = process._linkedBinding('electron_browser_top_level_window');
+const { TopLevelWindow } = process.electronBinding('top_level_window');
 
 Object.setPrototypeOf(TopLevelWindow.prototype, EventEmitter.prototype);
 

lib/browser/api/tray.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { Tray } = process.electronBinding('tray');
+
+module.exports = Tray;

lib/browser/api/tray.ts

@@ -1,3 +0,0 @@
-const { Tray } = process._linkedBinding('electron_browser_tray');
-
-export default Tray;

lib/browser/api/view.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { View } = process.electronBinding('view');
+
+module.exports = View;

lib/browser/api/view.ts

@@ -1,3 +0,0 @@
-const { View } = process._linkedBinding('electron_browser_view');
-
-export default View;

lib/browser/api/views/image-view.js

@@ -0,0 +1,8 @@
+const electron = require('electron');
+
+const { View } = electron;
+const { ImageView } = process.electronBinding('image_view');
+
+Object.setPrototypeOf(ImageView.prototype, View.prototype);
+
+module.exports = ImageView;

lib/browser/api/views/image-view.ts

@@ -1,7 +0,0 @@
-import { View } from 'electron';
-
-const { ImageView } = process._linkedBinding('electron_browser_image_view');
-
-Object.setPrototypeOf(ImageView.prototype, View.prototype);
-
-export default ImageView;

lib/browser/api/web-contents-view.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const electron = require('electron');
+
+const { View } = electron;
+const { WebContentsView } = process.electronBinding('web_contents_view');
+
+Object.setPrototypeOf(WebContentsView.prototype, View.prototype);
+
+module.exports = WebContentsView;

lib/browser/api/web-contents-view.ts

@@ -1,7 +0,0 @@
-import { View } from 'electron';
-
-const { WebContentsView } = process._linkedBinding('electron_browser_web_contents_view');
-
-Object.setPrototypeOf(WebContentsView.prototype, View.prototype);
-
-export default WebContentsView;

lib/browser/api/web-contents.js

@@ -64,6 +64,19 @@ const PDFPageSizes = {
   }
 };
 
+// The minimum micron size Chromium accepts is that where:
+// Per printing/units.h:
+//  * kMicronsPerInch - Length of an inch in 0.001mm unit.
+//  * kPointsPerInch - Length of an inch in CSS's 1pt unit.
+//
+// Formula: (kPointsPerInch / kMicronsPerInch) * size >= 1
+//
+// Practically, this means microns need to be > 352 microns.
+// We therefore need to verify this or it will silently fail.
+const isValidCustomPageSize = (width, height) => {
+  return [width, height].every(x => x > 352);
+};
+
 // Default printing setting
 const defaultPrintingSetting = {
   // Customizable.
@@ -97,7 +110,7 @@ const defaultPrintingSetting = {
 };
 
 // JavaScript implementations of WebContents.
-const binding = process._linkedBinding('electron_browser_web_contents');
+const binding = process.electronBinding('web_contents');
 const { WebContents } = binding;
 
 Object.setPrototypeOf(NavigationController.prototype, EventEmitter.prototype);
@@ -215,7 +228,9 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, h
 };
 
 // Translate the options of printToPDF.
-WebContents.prototype.printToPDF = function (options) {
+
+let pendingPromise;
+WebContents.prototype.printToPDF = async function (options) {
   const printSettings = {
     ...defaultPrintingSetting,
     requestID: getNextId()
@@ -318,13 +333,20 @@ WebContents.prototype.printToPDF = function (options) {
         const error = new Error('height and width properties are required for pageSize');
         return Promise.reject(error);
       }
-      // Dimensions in Microns
-      // 1 meter = 10^6 microns
+
+      // Dimensions in Microns - 1 meter = 10^6 microns
+      const height = Math.ceil(pageSize.height);
+      const width = Math.ceil(pageSize.width);
+      if (!isValidCustomPageSize(width, height)) {
+        const error = new Error('height and width properties must be minimum 352 microns.');
+        return Promise.reject(error);
+      }
+
       printSettings.mediaSize = {
         name: 'CUSTOM',
         custom_display_name: 'Custom',
-        height_microns: Math.ceil(pageSize.height),
-        width_microns: Math.ceil(pageSize.width)
+        height_microns: height,
+        width_microns: width
       };
     } else if (PDFPageSizes[pageSize]) {
       printSettings.mediaSize = PDFPageSizes[pageSize];
@@ -341,7 +363,12 @@ WebContents.prototype.printToPDF = function (options) {
   // PrinterType enum from //printing/print_job_constants.h
   printSettings.printerType = 2;
   if (this._printToPDF) {
-    return this._printToPDF(printSettings);
+    if (pendingPromise) {
+      pendingPromise = pendingPromise.then(() => this._printToPDF(printSettings));
+    } else {
+      pendingPromise = this._printToPDF(printSettings);
+    }
+    return pendingPromise;
   } else {
     const error = new Error('Printing feature is disabled');
     return Promise.reject(error);
@@ -359,12 +386,19 @@ WebContents.prototype.print = function (options = {}, callback) {
         if (!pageSize.height || !pageSize.width) {
           throw new Error('height and width properties are required for pageSize');
         }
+
         // Dimensions in Microns - 1 meter = 10^6 microns
+        const height = Math.ceil(pageSize.height);
+        const width = Math.ceil(pageSize.width);
+        if (!isValidCustomPageSize(width, height)) {
+          throw new Error('height and width properties must be minimum 352 microns.');
+        }
+
         options.mediaSize = {
           name: 'CUSTOM',
           custom_display_name: 'Custom',
-          height_microns: Math.ceil(pageSize.height),
-          width_microns: Math.ceil(pageSize.width)
+          height_microns: height,
+          width_microns: width
         };
       } else if (PDFPageSizes[pageSize]) {
         options.mediaSize = PDFPageSizes[pageSize];
@@ -562,7 +596,7 @@ WebContents.prototype._init = function () {
     app.emit('login', event, this, ...args);
   });
 
-  const event = process._linkedBinding('electron_browser_event').createEmpty();
+  const event = process.electronBinding('event').createEmpty();
   app.emit('web-contents-created', event, this);
 
   // Properties

lib/browser/default-menu.ts

@@ -1,6 +1,6 @@
 import { shell, Menu } from 'electron';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 const isMac = process.platform === 'darwin';
 

lib/browser/desktop-capturer.ts

@@ -1,7 +1,4 @@
-const {
-  createDesktopCapturer,
-  getMediaSourceIdForWebContents: getMediaSourceIdForWebContentsBinding
-} = process._linkedBinding('electron_browser_desktop_capturer');
+const { createDesktopCapturer } = process.electronBinding('desktop_capturer');
 
 const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);
 
@@ -80,7 +77,3 @@ export const getSourcesImpl = (event: Electron.IpcMainEvent | null, args: Electr
 
   return getSources;
 };
-
-export const getMediaSourceIdForWebContents = (event: Electron.IpcMainEvent, webContentsId: number) => {
-  return getMediaSourceIdForWebContentsBinding(event.sender.id, webContentsId);
-};

lib/browser/guest-view-manager.js

@@ -59,7 +59,7 @@ function sanitizeOptionsForGuest (options) {
 // Create a new guest instance.
 const createGuest = function (embedder, params) {
   if (webViewManager == null) {
-    webViewManager = process._linkedBinding('electron_browser_web_view_manager');
+    webViewManager = process.electronBinding('web_view_manager');
   }
 
   const guest = webContents.create({

lib/browser/guest-window-manager.js

@@ -2,7 +2,7 @@
 
 const electron = require('electron');
 const { BrowserWindow } = electron;
-const { isSameOrigin } = process._linkedBinding('electron_common_v8_util');
+const { isSameOrigin } = process.electronBinding('v8_util');
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal');
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils');
 const { parseFeatures } = require('@electron/internal/common/parse-features-string');

lib/browser/init.ts

@@ -17,7 +17,7 @@ require('../common/reset-search-paths');
 // Import common settings.
 require('@electron/internal/common/init');
 
-process._linkedBinding('electron_browser_event_emitter').setEventEmitterPrototype(EventEmitter.prototype);
+process.electronBinding('event_emitter').setEventEmitterPrototype(EventEmitter.prototype);
 
 if (process.platform === 'win32') {
   // Redirect node's console to use our own implementations, since node can not

lib/browser/remote/objects-registry.ts

@@ -2,7 +2,7 @@
 
 import { WebContents } from 'electron';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 const getOwnerKey = (webContents: WebContents, contextId: string) => {
   return `${webContents.id}-${contextId}`;
@@ -51,11 +51,19 @@ class ObjectsRegistry {
   // 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) {
+  // rendererSideRefCount is the ref count that the renderer process reported
+  // at time of GC if this is different to the number of references we sent to
+  // the given owner then a GC occurred between a ref being sent and the value
+  // being pulled out of the weak map.
+  // In this case we decrement out ref count and do not delete the stored
+  // object
+  // For more details on why we do renderer side ref counting see
+  // https://github.com/electron/electron/pull/17464
+  remove (webContents: WebContents, contextId: string, id: number, rendererSideRefCount: number) {
     const ownerKey = getOwnerKey(webContents, contextId);
     const owner = this.owners[ownerKey];
     if (owner && owner.has(id)) {
-      const newRefCount = owner.get(id)! - 1;
+      const newRefCount = owner.get(id)! - rendererSideRefCount;
 
       // Only completely remove if the number of references GCed in the
       // renderer is the same as the number of references we sent them

lib/browser/remote/server.ts

@@ -1,60 +1,38 @@
+'use strict';
+
 import * as electron from 'electron';
 import { EventEmitter } from 'events';
 import objectsRegistry from './objects-registry';
 import { ipcMainInternal } from '../ipc-main-internal';
-import { isPromise, isSerializableObject, deserialize, serialize } from '../../common/type-utils';
-import type { MetaTypeFromRenderer, ObjectMember, MetaType, ObjProtoDescriptor } from '../../common/remote/types';
+import { isPromise, isSerializableObject, deserialize, serialize } from '@electron/internal/common/type-utils';
+import { Size } from 'electron/main';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
-const eventBinding = process._linkedBinding('electron_browser_event');
-const features = process._linkedBinding('electron_common_features');
-const { NativeImage } = process._linkedBinding('electron_common_native_image');
+const v8Util = process.electronBinding('v8_util');
+const eventBinding = process.electronBinding('event');
+const features = process.electronBinding('features');
+const { NativeImage } = process.electronBinding('native_image');
 
 if (!features.isRemoteModuleEnabled()) {
   throw new Error('remote module is disabled');
 }
 
+const hasProp = {}.hasOwnProperty;
+
 // 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 };
-type WeakRef<T> = { deref(): T | undefined }
-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 (globalThis as any).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()) { fi.webContents.sendToFrame(fi.frameId, 'ELECTRON_RENDERER_RELEASE_CALLBACK', fi.id[0], fi.id[1]); }
-  }
-});
+// id => Function
+const rendererFunctions = v8Util.createDoubleIDWeakMap<(...args: any[]) => void>();
 
-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, value: CallIntoRenderer) {
-  // eslint-disable-next-line no-undef
-  const wr = new (globalThis as any).WeakRef(value) as WeakRef<CallIntoRenderer>;
-  const mapKey = id[0] + '~' + id[1];
-  rendererFunctionCache.set(mapKey, wr);
-  finalizationRegistry.register(value, {
-    id,
-    webContents: wc,
-    frameId
-  } as FinalizerInfo);
-  return value;
+type ObjectMember = {
+  name: string,
+  value?: any,
+  enumerable?: boolean,
+  writable?: boolean,
+  type?: 'method' | 'get'
 }
 
 // Return the description of object's members:
@@ -82,6 +60,11 @@ const getObjectMembers = function (object: any): ObjectMember[] {
   });
 };
 
+type ObjProtoDescriptor = {
+  members: ObjectMember[],
+  proto: ObjProtoDescriptor
+} | null
+
 // Return the description of object's prototype.
 const getObjectPrototype = function (object: any): ObjProtoDescriptor {
   const proto = Object.getPrototypeOf(object);
@@ -92,42 +75,76 @@ const getObjectPrototype = function (object: any): ObjProtoDescriptor {
   };
 };
 
+type MetaType = {
+  type: 'number',
+  value: number
+} | {
+  type: 'boolean',
+  value: boolean
+} | {
+  type: 'string',
+  value: string
+} | {
+  type: 'bigint',
+  value: bigint
+} | {
+  type: 'symbol',
+  value: symbol
+} | {
+  type: 'undefined',
+  value: undefined
+} | {
+  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: 'promise',
+  then: MetaType
+} | {
+  type: 'nativeimage'
+  value: electron.NativeImage
+}
+
 // 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 instanceof 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:
+  let type: MetaType['type'] = typeof value;
+  if (type === 'object') {
+    // Recognize certain types of objects.
+    if (value instanceof Buffer) {
+      type = 'buffer';
+    } else if (value instanceof NativeImage) {
+      type = 'nativeimage';
+    } else if (Array.isArray(value)) {
+      type = 'array';
+    } else if (value instanceof Error) {
+      type = 'error';
+    } else if (isSerializableObject(value)) {
       type = 'value';
-      break;
+    } else if (isPromise(value)) {
+      type = 'promise';
+    } else if (hasProp.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';
+    }
   }
 
   // Fill the meta object according to value's type.
@@ -207,6 +224,46 @@ const removeRemoteListenersAndLogWarning = (sender: any, callIntoRenderer: (...a
   console.warn(message);
 };
 
+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
+  }[]
+}
+
 const fakeConstructor = (constructor: Function, name: string) =>
   new Proxy(Object, {
     get (target, prop, receiver) {
@@ -258,8 +315,9 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: number, cont
         const objectId: [string, number] = [contextId, meta.id];
 
         // Cache the callbacks in renderer.
-        const cachedFunction = getCachedRendererFunction(objectId);
-        if (cachedFunction !== undefined) { return cachedFunction; }
+        if (rendererFunctions.has(objectId)) {
+          return rendererFunctions.get(objectId);
+        }
 
         const callIntoRenderer = function (this: any, ...args: any[]) {
           let succeed = false;
@@ -273,7 +331,8 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: number, cont
         v8Util.setHiddenValue(callIntoRenderer, 'location', meta.location);
         Object.defineProperty(callIntoRenderer, 'length', { value: meta.length });
 
-        setCachedRendererFunction(objectId, sender, frameId, callIntoRenderer);
+        v8Util.setRemoteCallbackFreer(callIntoRenderer, frameId, contextId, meta.id, sender);
+        rendererFunctions.set(objectId, callIntoRenderer);
         return callIntoRenderer;
       }
       default:
@@ -290,7 +349,7 @@ const isRemoteModuleEnabledImpl = function (contents: electron.WebContents) {
 
 const isRemoteModuleEnabledCache = new WeakMap();
 
-export const isRemoteModuleEnabled = function (contents: electron.WebContents) {
+const isRemoteModuleEnabled = function (contents: electron.WebContents) {
   if (!isRemoteModuleEnabledCache.has(contents)) {
     isRemoteModuleEnabledCache.set(contents, isRemoteModuleEnabledImpl(contents));
   }
@@ -338,12 +397,11 @@ const logStack = function (contents: electron.WebContents, code: string, stack:
 
 handleRemoteCommand('ELECTRON_BROWSER_WRONG_CONTEXT_ERROR', function (event, contextId, passedContextId, id) {
   const objectId: [string, number] = [passedContextId, id];
-  const cachedFunction = getCachedRendererFunction(objectId);
-  if (cachedFunction === undefined) {
+  if (!rendererFunctions.has(objectId)) {
     // Do nothing if the error has already been reported before.
     return;
   }
-  removeRemoteListenersAndLogWarning(event.sender, cachedFunction);
+  removeRemoteListenersAndLogWarning(event.sender, rendererFunctions.get(objectId)!);
 });
 
 handleRemoteCommand('ELECTRON_BROWSER_REQUIRE', function (event, contextId, moduleName, stack) {
@@ -499,10 +557,14 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_GET', function (event, contextId, i
   return valueToMeta(event.sender, contextId, obj[name]);
 });
 
-handleRemoteCommand('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id) {
-  objectsRegistry.remove(event.sender, contextId, id);
+handleRemoteCommand('ELECTRON_BROWSER_DEREFERENCE', function (event, contextId, id, rendererSideRefCount) {
+  objectsRegistry.remove(event.sender, contextId, id, rendererSideRefCount);
 });
 
 handleRemoteCommand('ELECTRON_BROWSER_CONTEXT_RELEASE', (event, contextId) => {
   objectsRegistry.clear(event.sender, contextId);
 });
+
+module.exports = {
+  isRemoteModuleEnabled
+};

lib/browser/rpc-server.js

@@ -3,8 +3,8 @@
 const electron = require('electron');
 const fs = require('fs');
 
-const eventBinding = process._linkedBinding('electron_browser_event');
-const clipboard = process._linkedBinding('electron_common_clipboard');
+const eventBinding = process.electronBinding('event');
+const clipboard = process.electronBinding('clipboard');
 
 const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal');
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils');
@@ -73,10 +73,6 @@ if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
 
     return typeUtils.serialize(await desktopCapturer.getSourcesImpl(event, options));
   });
-
-  ipcMainInternal.handle('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_MEDIA_SOURCE_ID_FOR_WEB_CONTENTS', function (event, webContentsId, stack) {
-    return desktopCapturer.getMediaSourceIdForWebContents(event, webContentsId);
-  });
 }
 
 const isRemoteModuleEnabled = BUILDFLAG(ENABLE_REMOTE_MODULE)

lib/common/api/clipboard.js

@@ -1,11 +1,13 @@
-const clipboard = process._linkedBinding('electron_common_clipboard');
+'use strict';
+
+const clipboard = process.electronBinding('clipboard');
 
 if (process.type === 'renderer') {
   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[]) => {
+  const makeRemoteMethod = function (method) {
+    return (...args) => {
       args = typeUtils.serialize(args);
       const result = ipcRendererUtils.invokeSync('ELECTRON_BROWSER_CLIPBOARD_SYNC', method, ...args);
       return typeUtils.deserialize(result);
@@ -14,7 +16,7 @@ if (process.type === 'renderer') {
 
   if (process.platform === 'linux') {
     // On Linux we could not access clipboard in renderer process.
-    for (const method of Object.keys(clipboard) as (keyof Electron.Clipboard)[]) {
+    for (const method of Object.keys(clipboard)) {
       clipboard[method] = makeRemoteMethod(method);
     }
   } else if (process.platform === 'darwin') {
@@ -24,4 +26,4 @@ if (process.type === 'renderer') {
   }
 }
 
-export default clipboard;
+module.exports = clipboard;

lib/common/api/deprecate.ts

@@ -76,6 +76,23 @@ const deprecate: ElectronInternal.DeprecationUtil = {
     });
   },
 
+  // deprecate a getter/setter function pair in favor of a property
+  fnToProperty: (prototype: any, prop: string, getter: string, setter?: string) => {
+    const withWarnOnce = function (obj: any, key: any, oldName: string, newName: string) {
+      const warn = warnOnce(oldName, newName);
+      const method = obj[key];
+      return function (this: any, ...args: any) {
+        warn();
+        return method.apply(this, args);
+      };
+    };
+
+    prototype[getter.substr(1)] = withWarnOnce(prototype, getter, `${getter.substr(1)} function`, `${prop} property`);
+    if (setter) {
+      prototype[setter.substr(1)] = withWarnOnce(prototype, setter, `${setter.substr(1)} function`, `${prop} property`);
+    }
+  },
+
   // remove a property with no replacement
   removeProperty: (o, removedName, onlyForValues) => {
     // if the property's already been removed, warn about it

lib/common/api/native-image.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const { nativeImage } = process.electronBinding('native_image');
+
+module.exports = nativeImage;

lib/common/api/native-image.ts

@@ -1,3 +0,0 @@
-const { nativeImage } = process._linkedBinding('electron_common_native_image');
-
-export default nativeImage;

lib/common/api/shell.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = process.electronBinding('shell');

lib/common/api/shell.ts

@@ -1 +0,0 @@
-export default process._linkedBinding('electron_common_shell');

lib/common/electron-binding-setup.ts

@@ -0,0 +1,13 @@
+export function electronBindingSetup (binding: typeof process['_linkedBinding'], processType: typeof process['type']): typeof process['electronBinding'] {
+  return function electronBinding (name: string) {
+    try {
+      return binding(`electron_${processType}_${name}`);
+    } catch (error) {
+      if (/No such module/.test(error.message)) {
+        return binding(`electron_common_${name}`);
+      } else {
+        throw error;
+      }
+    }
+  };
+}

lib/common/init.ts

@@ -1,7 +1,11 @@
 import * as util from 'util';
 
+import { electronBindingSetup } from '@electron/internal/common/electron-binding-setup';
+
 const timers = require('timers');
 
+process.electronBinding = electronBindingSetup(process._linkedBinding, process.type);
+
 type AnyFn = (...args: any[]) => any
 
 // setImmediate and process.nextTick makes use of uv_check and uv_prepare to

lib/common/remote/types.ts

@@ -1,85 +0,0 @@
-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,4 +1,4 @@
-const { nativeImage, NativeImage } = process._linkedBinding('electron_common_native_image');
+const { nativeImage, NativeImage } = process.electronBinding('native_image');
 
 export function isPromise (val: any) {
   return (

lib/isolated_renderer/init.js

@@ -2,9 +2,9 @@
 
 /* global nodeProcess, isolatedWorld */
 
-process._linkedBinding = nodeProcess._linkedBinding;
+process.electronBinding = require('@electron/internal/common/electron-binding-setup').electronBindingSetup(nodeProcess._linkedBinding, 'renderer');
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 const webViewImpl = v8Util.getHiddenValue(isolatedWorld, 'web-view-impl');
 

lib/renderer/api/context-bridge.ts

@@ -1,5 +1,5 @@
-const { hasSwitch } = process._linkedBinding('electron_common_command_line');
-const binding = process._linkedBinding('electron_renderer_context_bridge');
+const { hasSwitch } = process.electronBinding('command_line');
+const binding = process.electronBinding('context_bridge');
 
 const contextIsolationEnabled = hasSwitch('context-isolation');
 

lib/renderer/api/crash-reporter.ts

@@ -1,7 +1,7 @@
 import { invokeSync } from '../ipc-renderer-internal-utils';
 import { deprecate } from 'electron';
 
-const binding = process._linkedBinding('electron_renderer_crash_reporter');
+const binding = process.electronBinding('crash_reporter');
 
 export default {
   start (options: Electron.CrashReporterStartOptions) {

lib/renderer/api/desktop-capturer.ts

@@ -1,7 +1,7 @@
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import { deserialize } from '@electron/internal/common/type-utils';
 
-const { hasSwitch } = process._linkedBinding('electron_common_command_line');
+const { hasSwitch } = process.electronBinding('command_line');
 
 const enableStacks = hasSwitch('enable-api-filtering-logging');
 
@@ -16,7 +16,3 @@ function getCurrentStack () {
 export async function getSources (options: Electron.SourcesOptions) {
   return deserialize(await ipcRendererInternal.invoke('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', options, getCurrentStack()));
 }
-
-export function getMediaSourceIdForWebContents (webContentsId: number) {
-  return ipcRendererInternal.invoke<string>('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_MEDIA_SOURCE_ID_FOR_WEB_CONTENTS', webContentsId, getCurrentStack());
-}

lib/renderer/api/ipc-renderer.ts

@@ -1,36 +1,39 @@
-import { EventEmitter } from 'events';
-
-const { ipc } = process._linkedBinding('electron_renderer_ipc');
+const { ipc } = process.electronBinding('ipc');
+const v8Util = process.electronBinding('v8_util');
 
+// Created by init.js.
+const ipcRenderer = v8Util.getHiddenValue<Electron.IpcRenderer>(global, 'ipc');
 const internal = false;
 
-const ipcRenderer = new EventEmitter() as Electron.IpcRenderer;
-ipcRenderer.send = function (channel, ...args) {
-  return ipc.send(internal, channel, args);
-};
+// TODO(MarshallOfSound): Remove if statement when isolated_bundle and content_script_bundle are gone
+if (!ipcRenderer.send) {
+  ipcRenderer.send = function (channel, ...args) {
+    return ipc.send(internal, channel, args);
+  };
 
-ipcRenderer.sendSync = function (channel, ...args) {
-  return ipc.sendSync(internal, channel, args)[0];
-};
+  ipcRenderer.sendSync = function (channel, ...args) {
+    return ipc.sendSync(internal, channel, args)[0];
+  };
 
-ipcRenderer.sendToHost = function (channel, ...args) {
-  return ipc.sendToHost(channel, args);
-};
+  ipcRenderer.sendToHost = function (channel, ...args) {
+    return ipc.sendToHost(channel, args);
+  };
 
-ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
-  return ipc.sendTo(internal, false, webContentsId, channel, args);
-};
+  ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
+    return ipc.sendTo(internal, false, webContentsId, channel, args);
+  };
 
-ipcRenderer.invoke = async function (channel, ...args) {
-  const { error, result } = await ipc.invoke(internal, channel, args);
-  if (error) {
-    throw new Error(`Error invoking remote method '${channel}': ${error}`);
-  }
-  return result;
-};
+  ipcRenderer.invoke = async function (channel, ...args) {
+    const { error, result } = await ipc.invoke(internal, channel, args);
+    if (error) {
+      throw new Error(`Error invoking remote method '${channel}': ${error}`);
+    }
+    return result;
+  };
 
-ipcRenderer.postMessage = function (channel: string, message: any, transferables: any) {
-  return ipc.postMessage(channel, message, transferables);
-};
+  ipcRenderer.postMessage = function (channel: string, message: any, transferables: any) {
+    return ipc.postMessage(channel, message, transferables);
+  };
+}
 
 export default ipcRenderer;

lib/renderer/api/module-list.ts

@@ -1,4 +1,4 @@
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 const enableRemoteModule = v8Util.getHiddenValue<boolean>(global, 'enableRemoteModule');
 

lib/renderer/api/remote.js

@@ -1,41 +1,18 @@
-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 { browserModuleNames } from '@electron/internal/browser/api/module-names';
-import { commonModuleList } from '@electron/internal/common/api/module-list';
+'use strict';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
-const { hasSwitch } = process._linkedBinding('electron_common_command_line');
-const { NativeImage } = process._linkedBinding('electron_common_native_image');
+const v8Util = process.electronBinding('v8_util');
+const { hasSwitch } = process.electronBinding('command_line');
+const { NativeImage } = process.electronBinding('native_image');
+
+const { CallbacksRegistry } = require('@electron/internal/renderer/remote/callbacks-registry');
+const { isPromise, isSerializableObject, serialize, deserialize } = require('@electron/internal/common/type-utils');
+const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal');
 
 const callbacksRegistry = new CallbacksRegistry();
-const remoteObjectCache = new Map();
-const finalizationRegistry = new (window as any).FinalizationRegistry((id: number) => {
-  const ref = remoteObjectCache.get(id);
-  if (ref !== undefined && ref.deref() === undefined) {
-    remoteObjectCache.delete(id);
-    ipcRendererInternal.send('ELECTRON_BROWSER_DEREFERENCE', contextId, id, 0);
-  }
-});
-
-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 (window as any).WeakRef(value);
-  remoteObjectCache.set(id, wr);
-  finalizationRegistry.register(value, id);
-  return value;
-}
+const remoteObjectCache = v8Util.createIDWeakMap();
 
 // An unique ID that can represent current context.
-const contextId = v8Util.getHiddenValue<string>(global, 'contextId');
+const contextId = v8Util.getHiddenValue(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
@@ -49,8 +26,8 @@ process.on('exit', () => {
 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 => {
+function wrapArgs (args, visited = new Set()) {
+  const valueToMeta = (value) => {
     // Check for circular reference.
     if (visited.has(value)) {
       return {
@@ -83,7 +60,7 @@ function wrapArgs (args: any[], visited = new Set()): any {
       if (isPromise(value)) {
         return {
           type: 'promise',
-          then: valueToMeta(function (onFulfilled: Function, onRejected: Function) {
+          then: valueToMeta(function (onFulfilled, onRejected) {
             value.then(onFulfilled, onRejected);
           })
         };
@@ -94,7 +71,7 @@ function wrapArgs (args: any[], visited = new Set()): any {
         };
       }
 
-      const meta: MetaTypeFromRenderer = {
+      const meta = {
         type: 'object',
         name: value.constructor ? value.constructor.name : '',
         members: []
@@ -133,15 +110,15 @@ function wrapArgs (args: any[], visited = new Set()): any {
 // Populate object's members from descriptors.
 // The |ref| will be kept referenced by |members|.
 // This matches |getObjectMemebers| in rpc-server.
-function setObjectMembers (ref: any, object: any, metaId: number, members: ObjectMember[]) {
+function setObjectMembers (ref, object, metaId, members) {
   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 };
+    const descriptor = { enumerable: member.enumerable };
     if (member.type === 'method') {
-      const remoteMemberFunction = function (this: any, ...args: any[]) {
+      const remoteMemberFunction = function (...args) {
         let command;
         if (this && this.constructor === remoteMemberFunction) {
           command = 'ELECTRON_BROWSER_MEMBER_CONSTRUCTOR';
@@ -188,7 +165,7 @@ function setObjectMembers (ref: any, object: any, metaId: number, members: Objec
 
 // Populate object's prototype from descriptor.
 // This matches |getObjectPrototype| in rpc-server.
-function setObjectPrototype (ref: any, object: any, metaId: number, descriptor: ObjProtoDescriptor) {
+function setObjectPrototype (ref, object, metaId, descriptor) {
   if (descriptor === null) return;
   const proto = {};
   setObjectMembers(ref, proto, metaId, descriptor.members);
@@ -197,7 +174,7 @@ function setObjectPrototype (ref: any, object: any, metaId: number, descriptor:
 }
 
 // Wrap function in Proxy for accessing remote properties
-function proxyFunctionProperties (remoteMemberFunction: Function, metaId: number, name: string) {
+function proxyFunctionProperties (remoteMemberFunction, metaId, name) {
   let loaded = false;
 
   // Lazily load function properties
@@ -209,13 +186,13 @@ function proxyFunctionProperties (remoteMemberFunction: Function, metaId: number
     setObjectMembers(remoteMemberFunction, remoteMemberFunction, meta.id, meta.members);
   };
 
-  return new Proxy(remoteMemberFunction as any, {
-    set: (target, property, value) => {
+  return new Proxy(remoteMemberFunction, {
+    set: (target, property, value, receiver) => {
       if (property !== 'ref') loadRemoteProperties();
       target[property] = value;
       return true;
     },
-    get: (target, property) => {
+    get: (target, property, receiver) => {
       if (property === IS_REMOTE_PROXY) return true;
       if (!Object.prototype.hasOwnProperty.call(target, property)) loadRemoteProperties();
       const value = target[property];
@@ -238,31 +215,29 @@ function proxyFunctionProperties (remoteMemberFunction: Function, metaId: number
 }
 
 // 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}`); }
+function metaToValue (meta) {
+  const types = {
+    value: () => meta.value,
+    array: () => meta.members.map((member) => metaToValue(member)),
+    nativeimage: () => deserialize(meta.value),
+    buffer: () => Buffer.from(meta.value.buffer, meta.value.byteOffset, meta.value.byteLength),
+    promise: () => Promise.resolve({ then: metaToValue(meta.then) }),
+    error: () => metaToError(meta),
+    exception: () => { throw metaToError(meta.value); }
+  };
+
+  if (Object.prototype.hasOwnProperty.call(types, meta.type)) {
+    return types[meta.type]();
   } else {
     let ret;
-    if ('id' in meta) {
-      const cached = getCachedRemoteObject(meta.id);
-      if (cached !== undefined) { return cached; }
+    if (remoteObjectCache.has(meta.id)) {
+      v8Util.addRemoteObjectRef(contextId, meta.id);
+      return remoteObjectCache.get(meta.id);
     }
 
     // A shadow class to represent the remote function object.
     if (meta.type === 'function') {
-      const remoteFunction = function (this: any, ...args: any[]) {
+      const remoteFunction = function (...args) {
         let command;
         if (this && this.constructor === remoteFunction) {
           command = 'ELECTRON_BROWSER_CONSTRUCTOR';
@@ -279,18 +254,20 @@ function metaToValue (meta: MetaType): any {
 
     setObjectMembers(ret, ret, meta.id, meta.members);
     setObjectPrototype(ret, ret, meta.id, meta.proto);
-    if (ret.constructor && (ret.constructor as any)[IS_REMOTE_PROXY]) {
+    if (ret.constructor && ret.constructor[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.
+    v8Util.setRemoteObjectFreer(ret, contextId, meta.id);
     v8Util.setHiddenValue(ret, 'electronId', meta.id);
-    setCachedRemoteObject(meta.id, ret);
+    v8Util.addRemoteObjectRef(contextId, meta.id);
+    remoteObjectCache.set(meta.id, ret);
     return ret;
   }
 }
 
-function metaToError (meta: { type: 'error', value: any, members: ObjectMember[] }) {
+function metaToError (meta) {
   const obj = meta.value;
   for (const { name, value } of meta.members) {
     obj[name] = metaToValue(value);
@@ -298,7 +275,7 @@ function metaToError (meta: { type: 'error', value: any, members: ObjectMember[]
   return obj;
 }
 
-function handleMessage (channel: string, handler: Function) {
+function handleMessage (channel, handler) {
   ipcRendererInternal.on(channel, (event, passedContextId, id, ...args) => {
     if (passedContextId === contextId) {
       handler(id, ...args);
@@ -311,8 +288,8 @@ function handleMessage (channel: string, handler: Function) {
 
 const enableStacks = hasSwitch('enable-api-filtering-logging');
 
-function getCurrentStack (): string | undefined {
-  const target = { stack: undefined as string | undefined };
+function getCurrentStack () {
+  const target = {};
   if (enableStacks) {
     Error.captureStackTrace(target, getCurrentStack);
   }
@@ -320,47 +297,47 @@ function getCurrentStack (): string | undefined {
 }
 
 // Browser calls a callback in renderer.
-handleMessage('ELECTRON_RENDERER_CALLBACK', (id: number, args: any) => {
+handleMessage('ELECTRON_RENDERER_CALLBACK', (id, args) => {
   callbacksRegistry.apply(id, metaToValue(args));
 });
 
 // A callback in browser is released.
-handleMessage('ELECTRON_RENDERER_RELEASE_CALLBACK', (id: number) => {
+handleMessage('ELECTRON_RENDERER_RELEASE_CALLBACK', (id) => {
   callbacksRegistry.remove(id);
 });
 
-exports.require = (module: string) => {
+exports.require = (module) => {
   const command = 'ELECTRON_BROWSER_REQUIRE';
   const meta = ipcRendererInternal.sendSync(command, contextId, module, getCurrentStack());
   return metaToValue(meta);
 };
 
 // Alias to remote.require('electron').xxx.
-export function getBuiltin (module: string) {
+exports.getBuiltin = (module) => {
   const command = 'ELECTRON_BROWSER_GET_BUILTIN';
   const meta = ipcRendererInternal.sendSync(command, contextId, module, getCurrentStack());
   return metaToValue(meta);
-}
+};
 
-export function getCurrentWindow (): BrowserWindow {
+exports.getCurrentWindow = () => {
   const command = 'ELECTRON_BROWSER_CURRENT_WINDOW';
   const meta = ipcRendererInternal.sendSync(command, contextId, getCurrentStack());
   return metaToValue(meta);
-}
+};
 
 // Get current WebContents object.
-export function getCurrentWebContents (): WebContents {
+exports.getCurrentWebContents = () => {
   const command = 'ELECTRON_BROWSER_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 {
+exports.getGlobal = (name) => {
   const command = 'ELECTRON_BROWSER_GLOBAL';
   const meta = ipcRendererInternal.sendSync(command, contextId, name, getCurrentStack());
   return metaToValue(meta);
-}
+};
 
 // Get the process object in browser.
 Object.defineProperty(exports, 'process', {
@@ -368,19 +345,22 @@ Object.defineProperty(exports, 'process', {
 });
 
 // Create a function that will return the specified value when called in browser.
-export function createFunctionWithReturnValue<T> (returnValue: T): () => T {
+exports.createFunctionWithReturnValue = (returnValue) => {
   const func = () => returnValue;
   v8Util.setHiddenValue(func, 'returnValue', true);
   return func;
-}
+};
 
-const addBuiltinProperty = (name: string) => {
+const addBuiltinProperty = (name) => {
   Object.defineProperty(exports, name, {
     get: () => exports.getBuiltin(name)
   });
 };
 
-const browserModules = commonModuleList.concat(browserModuleNames.map(name => ({ name, loader: () => {} })));
+const { commonModuleList } = require('@electron/internal/common/api/module-list');
+const { browserModuleNames } = require('@electron/internal/browser/api/module-names');
+
+const browserModules = commonModuleList.concat(browserModuleNames.map(name => ({ name })));
 
 // And add a helper receiver for each one.
 browserModules

lib/renderer/api/web-frame.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
+import deprecate from '@electron/internal/common/api/deprecate';
 
-const binding = process._linkedBinding('electron_renderer_web_frame');
+const binding = process.electronBinding('web_frame');
 
 class WebFrame extends EventEmitter {
   constructor (public context: Window) {
@@ -47,14 +48,26 @@ class WebFrame extends EventEmitter {
   }
 }
 
+const { hasSwitch } = process.electronBinding('command_line');
+const worldSafeJS = hasSwitch('world-safe-execute-javascript') && hasSwitch('context-isolation');
+
 // 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);
+      };
+    }
   }
 }
 

lib/renderer/content-scripts-injector.ts

@@ -2,7 +2,7 @@ import { webFrame } from 'electron';
 
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 const IsolatedWorldIDs = {
   /**

lib/renderer/init.ts

@@ -1,3 +1,4 @@
+import { EventEmitter } from 'events';
 import * as path from 'path';
 
 const Module = require('module');
@@ -36,24 +37,27 @@ require('../common/reset-search-paths');
 require('@electron/internal/common/init');
 
 // The global variable will be used by ipc for event dispatching
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
-const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal');
-const ipcRenderer = require('@electron/internal/renderer/api/ipc-renderer').default;
+const ipcEmitter = new EventEmitter();
+const ipcInternalEmitter = new EventEmitter();
+v8Util.setHiddenValue(global, 'ipc', ipcEmitter);
+v8Util.setHiddenValue(global, 'ipc-internal', ipcInternalEmitter);
 
 v8Util.setHiddenValue(global, 'ipcNative', {
   onMessage (internal: boolean, channel: string, ports: any[], args: any[], senderId: number) {
-    const sender = internal ? ipcRendererInternal : ipcRenderer;
+    const sender = internal ? ipcInternalEmitter : ipcEmitter;
     sender.emit(channel, { sender, senderId, ports }, ...args);
   }
 });
 
 // Use electron module after everything is ready.
+const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal');
 const { webFrameInit } = require('@electron/internal/renderer/web-frame-init');
 webFrameInit();
 
 // Process command line arguments.
-const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');
+const { hasSwitch, getSwitchValue } = process.electronBinding('command_line');
 
 const parseOption = function<T> (
   name: string, defaultValue: T, converter?: (value: string) => T
@@ -80,6 +84,9 @@ const appPath = parseOption('app-path', null);
 const guestInstanceId = parseOption('guest-instance-id', null, value => parseInt(value));
 const openerId = parseOption('opener-id', null, value => parseInt(value));
 
+// The arguments to be passed to isolated world.
+const isolatedWorldArgs = { ipcRendererInternal, guestInstanceId, isHiddenPage, openerId, usesNativeWindowOpen, rendererProcessReuseEnabled };
+
 // The webContents preload script is loaded after the session preload scripts.
 if (preloadScript) {
   preloadScripts.push(preloadScript);
@@ -109,6 +116,11 @@ if (process.isMainFrame) {
   webViewInit(contextIsolation, webviewTag, guestInstanceId);
 }
 
+// Pass the arguments to isolatedWorld.
+if (contextIsolation) {
+  v8Util.setHiddenValue(global, 'isolated-world-args', isolatedWorldArgs);
+}
+
 if (nodeIntegration) {
   // Export node bindings to global.
   const { makeRequireFunction } = __non_webpack_require__('internal/modules/cjs/helpers') // eslint-disable-line

lib/renderer/ipc-renderer-internal.ts

@@ -1,32 +1,33 @@
-import { EventEmitter } from 'events';
-
-const { ipc } = process._linkedBinding('electron_renderer_ipc');
+const { ipc } = process.electronBinding('ipc');
+const v8Util = process.electronBinding('v8_util');
 
+// Created by init.js.
+export const ipcRendererInternal = v8Util.getHiddenValue<Electron.IpcRendererInternal>(global, 'ipc-internal');
 const internal = true;
 
-const ipcRendererInternal = new EventEmitter() as any as Electron.IpcRendererInternal;
-ipcRendererInternal.send = function (channel, ...args) {
-  return ipc.send(internal, channel, args);
-};
+// TODO(MarshallOfSound): Remove if statement when isolated_bundle and content_script_bundle are gone
+if (!ipcRendererInternal.send) {
+  ipcRendererInternal.send = function (channel, ...args) {
+    return ipc.send(internal, channel, args);
+  };
 
-ipcRendererInternal.sendSync = function (channel, ...args) {
-  return ipc.sendSync(internal, channel, args)[0];
-};
+  ipcRendererInternal.sendSync = function (channel, ...args) {
+    return ipc.sendSync(internal, channel, args)[0];
+  };
 
-ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
-  return ipc.sendTo(internal, false, webContentsId, channel, args);
-};
+  ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
+    return ipc.sendTo(internal, false, webContentsId, channel, args);
+  };
 
-ipcRendererInternal.sendToAll = function (webContentsId, channel, ...args) {
-  return ipc.sendTo(internal, true, webContentsId, channel, args);
-};
+  ipcRendererInternal.sendToAll = function (webContentsId, channel, ...args) {
+    return ipc.sendTo(internal, true, webContentsId, channel, args);
+  };
 
-ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) {
-  const { error, result } = await ipc.invoke<T>(internal, channel, args);
-  if (error) {
-    throw new Error(`Error invoking remote method '${channel}': ${error}`);
-  }
-  return result;
-};
-
-export { ipcRendererInternal };
+  ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) {
+    const { error, result } = await ipc.invoke<T>(internal, channel, args);
+    if (error) {
+      throw new Error(`Error invoking remote method '${channel}': ${error}`);
+    }
+    return result;
+  };
+}

lib/renderer/remote/callbacks-registry.ts

@@ -1,4 +1,4 @@
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 export class CallbacksRegistry {
   private nextId: number = 0

lib/renderer/web-frame-init.ts

@@ -12,6 +12,11 @@ export const webFrameInit = () => {
   ipcRendererUtils.handle('ELECTRON_INTERNAL_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/web-view-impl.ts

@@ -8,7 +8,7 @@ import { syncMethods, asyncMethods, properties } from '@electron/internal/common
 import { deserialize } from '@electron/internal/common/type-utils';
 const { webFrame } = electron;
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 // ID generator.
 let nextId = 0;

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

@@ -1,6 +1,6 @@
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 
-const v8Util = process._linkedBinding('electron_common_v8_util');
+const v8Util = process.electronBinding('v8_util');
 
 function handleFocusBlur (guestInstanceId: number) {
   // Note that while Chromium content APIs have observer for focus/blur, they