Bump v13.0.0-beta.21

This reverts commit 4e48867af8.

.circleci/config.yml

@@ -57,35 +57,6 @@ parameters:
     type: boolean
     default: false
 
-# Executors
-executors:
-  linux-docker:
-    parameters:
-      size:
-        description: "Docker executor size"
-        default: 2xlarge+
-        type: enum
-        enum: ["medium", "xlarge", "2xlarge+"]
-    docker:
-      - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225
-    resource_class: << parameters.size >>
-
-  macos:
-    parameters:
-      size:
-        description: "macOS executor size"
-        default: large
-        type: enum
-        enum: ["medium", "large"]
-    macos:
-      xcode: "12.4.0"
-    resource_class: << parameters.size >>
-
-  # Electron Runners
-  apple-silicon:
-    resource_class: electronjs/macos-arm64
-    machine: true
-
 # The config expects the following environment variables to be set:
 #  - "SLACK_WEBHOOK" Slack hook URL to send notifications.
 #
@@ -95,6 +66,41 @@ executors:
 # CircleCI docs on variables:
 # https://circleci.com/docs/2.0/env-vars/
 
+# Build machines configs.
+docker-image: &docker-image
+  docker:
+    - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225
+
+machine-linux-medium: &machine-linux-medium
+  <<: *docker-image
+  resource_class: medium
+
+machine-linux-xlarge: &machine-linux-xlarge
+  <<: *docker-image
+  resource_class: xlarge
+
+machine-linux-2xlarge: &machine-linux-2xlarge
+  <<: *docker-image
+  resource_class: 2xlarge+
+
+machine-mac: &machine-mac
+  macos:
+    xcode: "12.4.0"
+
+machine-mac-large: &machine-mac-large
+  resource_class: large
+  macos:
+    xcode: "12.4.0"
+
+machine-mac-large-arm: &machine-mac-large-arm
+  resource_class: large
+  macos:
+    xcode: "12.4.0"
+
+machine-mac-arm64: &machine-mac-arm64
+  resource_class: electronjs/macos-arm64
+  machine: true
+
 # Build configurations options.
 env-testing-build: &env-testing-build
   GN_CONFIG: //electron/build/args/testing.gn
@@ -929,7 +935,7 @@ step-ninja-summary: &step-ninja-summary
     command: |
       set +e
       set +o pipefail
-      python depot_tools/post_build_ninja_summary.py -C src/out/Default || echo Ninja Summary Failed
+      python depot_tools/post_build_ninja_summary.py -C src/out/Default
 
 step-ninja-report: &step-ninja-report
   store_artifacts:
@@ -1383,6 +1389,9 @@ steps-test-node: &steps-test-node
     - store_test_results:
         path: src/junit
 
+chromium-upgrade-branches: &chromium-upgrade-branches
+  /chromium\-upgrade\/[0-9]+/
+
 # Command Aliases
 commands:
   maybe-restore-portaled-src-cache:
@@ -1688,17 +1697,13 @@ commands:
 jobs:
   # Layer 0: Lint. Standalone.
   lint:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
     <<: *steps-lint
 
   ts-compile-doc-change:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
@@ -1706,7 +1711,7 @@ jobs:
 
   # Layer 1: Checkout.
   linux-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1719,7 +1724,7 @@ jobs:
           restore-src-cache: false
 
   linux-checkout-fast:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1731,14 +1736,14 @@ jobs:
           persist-checkout: true
 
   linux-checkout-and-save-cache:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-checkout-and-save-cache
 
   linux-checkout-for-native-tests:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
@@ -1750,7 +1755,7 @@ jobs:
           persist-checkout: true
 
   linux-checkout-for-native-tests-with-no-patches:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
@@ -1762,7 +1767,7 @@ jobs:
           persist-checkout: true
 
   mac-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1777,7 +1782,7 @@ jobs:
           restore-src-cache: false
 
   mac-checkout-fast:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1791,7 +1796,7 @@ jobs:
           persist-checkout: true
 
   mac-checkout-and-save-cache:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1801,7 +1806,7 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1814,7 +1819,7 @@ jobs:
           use-out-cache: false
 
   linux-x64-testing-asan:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1830,7 +1835,7 @@ jobs:
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1844,16 +1849,14 @@ jobs:
           use-out-cache: false
 
   linux-x64-testing-gn-check:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
   linux-x64-release:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1866,7 +1869,7 @@ jobs:
           checkout: true
 
   linux-x64-publish:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1878,7 +1881,7 @@ jobs:
           checkout: true
 
   linux-x64-publish-skip-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1890,7 +1893,7 @@ jobs:
           checkout: false
 
   linux-ia32-testing:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-global
       <<: *env-ia32
@@ -1904,7 +1907,7 @@ jobs:
           use-out-cache: false
 
   linux-ia32-release:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1918,7 +1921,7 @@ jobs:
           checkout: true
 
   linux-ia32-publish:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1932,7 +1935,7 @@ jobs:
           checkout: true
 
   linux-ia32-publish-skip-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1946,7 +1949,7 @@ jobs:
           checkout: false
 
   linux-arm-testing:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1962,7 +1965,7 @@ jobs:
           use-out-cache: false
 
   linux-arm-release:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -1976,7 +1979,7 @@ jobs:
           checkout: true
 
   linux-arm-publish:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -1991,7 +1994,7 @@ jobs:
           checkout: true
 
   linux-arm-publish-skip-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -2005,7 +2008,7 @@ jobs:
           checkout: false
 
   linux-arm64-testing:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -2021,9 +2024,7 @@ jobs:
           use-out-cache: false
 
   linux-arm64-testing-gn-check:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm64
@@ -2031,7 +2032,7 @@ jobs:
     <<: *steps-electron-gn-check
 
   linux-arm64-release:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2045,7 +2046,7 @@ jobs:
           checkout: true
 
   linux-arm64-publish:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2059,7 +2060,7 @@ jobs:
           checkout: true
 
   linux-arm64-publish-skip-checkout:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2072,7 +2073,7 @@ jobs:
           checkout: false
 
   osx-testing-x64:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2087,16 +2088,28 @@ jobs:
           attach: false
 
   osx-testing-x64-gn-check:
-    executor:
-      name: macos
-      size: medium
+    <<: *machine-mac
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
+  osx-release-x64:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-release-build
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: false
+          checkout-and-assume-cache: true
+          attach: false
+
   osx-publish-x64:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2108,7 +2121,7 @@ jobs:
           checkout: true
 
   osx-publish-arm64:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2121,7 +2134,7 @@ jobs:
           checkout: true
 
   osx-publish-x64-skip-checkout:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2133,7 +2146,7 @@ jobs:
           checkout: false
 
   osx-publish-arm64-skip-checkout:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2146,7 +2159,7 @@ jobs:
           checkout: false
 
   osx-testing-arm64:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2163,7 +2176,7 @@ jobs:
           attach: false
 
   mas-testing-x64:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -2179,17 +2192,30 @@ jobs:
           attach: false
 
   mas-testing-x64-gn-check:
-    executor:
-      name: macos
-      size: medium
+    <<: *machine-mac
     environment:
       <<: *env-machine-mac
       <<: *env-mas
       <<: *env-testing-build
     <<: *steps-electron-gn-check
+
+  mas-release:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-mas
+      <<: *env-release-build
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: false
+          checkout-and-assume-cache: true
+          attach: false
   
   mas-publish:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2202,7 +2228,7 @@ jobs:
           checkout: true
 
   mas-publish-arm64:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2215,7 +2241,7 @@ jobs:
           checkout: true          
 
   mas-publish-x64-skip-checkout:
-    executor: macos
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2227,7 +2253,7 @@ jobs:
           checkout: false
 
   mas-publish-arm64-skip-checkout:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2240,7 +2266,7 @@ jobs:
           checkout: false
 
   mas-testing-arm64:
-    executor: macos
+    <<: *machine-mac-large-arm
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2258,7 +2284,7 @@ jobs:
 
   # Layer 3: Tests.
   linux-x64-unittests:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2266,7 +2292,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-disabled-unittests:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2275,7 +2301,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-chromium-unittests:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2284,7 +2310,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-browsertests:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-browsertests
@@ -2293,9 +2319,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-testing-tests:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2304,9 +2328,7 @@ jobs:
     <<: *steps-tests
 
   linux-x64-testing-asan-tests:
-    executor:
-      name: linux-docker
-      size: xlarge
+    <<: *machine-linux-xlarge
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2317,9 +2339,7 @@ jobs:
     <<: *steps-tests
 
   linux-x64-testing-nan:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2327,7 +2347,7 @@ jobs:
     <<: *steps-test-nan
 
   linux-x64-testing-node:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2335,9 +2355,7 @@ jobs:
     <<: *steps-test-node
 
   linux-x64-release-tests:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2345,9 +2363,7 @@ jobs:
     <<: *steps-tests
 
   linux-x64-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2355,9 +2371,7 @@ jobs:
     <<: *steps-verify-ffmpeg
 
   linux-ia32-testing-tests:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2367,9 +2381,7 @@ jobs:
     <<: *steps-tests
 
   linux-ia32-testing-nan:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2378,7 +2390,7 @@ jobs:
     <<: *steps-test-nan
 
   linux-ia32-testing-node:
-    executor: linux-docker
+    <<: *machine-linux-2xlarge
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2387,9 +2399,7 @@ jobs:
     <<: *steps-test-node
 
   linux-ia32-release-tests:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2398,9 +2408,7 @@ jobs:
     <<: *steps-tests
 
   linux-ia32-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2409,17 +2417,30 @@ jobs:
     <<: *steps-verify-ffmpeg
 
   osx-testing-x64-tests:
-    executor:
-      name: macos
-      size: medium
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
     parallelism: 2
     <<: *steps-tests
 
+  osx-release-x64-tests:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+      <<: *env-send-slack-notifications
+    <<: *steps-tests
+
+  osx-verify-ffmpeg:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-ffmpeg
+
   osx-testing-arm64-tests:  
-    executor: apple-silicon
+    <<: *machine-mac-arm64
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2427,17 +2448,30 @@ jobs:
     <<: *steps-tests
 
   mas-testing-x64-tests:
-    executor:
-      name: macos
-      size: medium
+    <<: *machine-mac-large
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
     parallelism: 2
     <<: *steps-tests
 
+  mas-release-tests:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+      <<: *env-send-slack-notifications
+    <<: *steps-tests
+
+  mas-verify-ffmpeg:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-ffmpeg
+
   mas-testing-arm64-tests:
-    executor: apple-silicon
+    <<: *machine-mac-arm64
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2446,9 +2480,7 @@ jobs:
 
   # Layer 4: Summary.
   linux-x64-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2456,9 +2488,7 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-ia32-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2466,9 +2496,7 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-arm-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2476,15 +2504,29 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-arm64-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
+    <<: *machine-linux-medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
     steps:
       - *step-maybe-notify-slack-success
 
+  mas-release-summary:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    steps:
+      - *step-maybe-notify-slack-success
+
+  osx-release-x64-summary:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-send-slack-notifications
+    steps:
+      - *step-maybe-notify-slack-success
+
 workflows:
   version: 2.1
 
@@ -2561,7 +2603,7 @@ workflows:
     when: << pipeline.parameters.run-mas-publish-arm64 >>
     jobs:
     - mas-publish-arm64:
-        context: release-env
+        context: release-env        
 
   publish-macos:
     when: << pipeline.parameters.run-macos-publish >>
@@ -2695,6 +2737,7 @@ workflows:
             branches:
               only:
                 - master
+                - *chromium-upgrade-branches
     jobs:
       - linux-checkout-fast
       - linux-checkout-and-save-cache
@@ -2735,6 +2778,49 @@ workflows:
           requires:
             - linux-arm64-release
 
+  nightly-mac-release-test:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+                - *chromium-upgrade-branches
+    jobs:
+      - mac-checkout-fast
+      - mac-checkout-and-save-cache
+
+      - osx-release-x64:
+          requires:
+            - mac-checkout-and-save-cache
+      - osx-release-x64-tests:
+          requires:
+            - osx-release-x64
+      - osx-verify-ffmpeg:
+          requires:
+            - osx-release-x64
+      - osx-release-x64-summary:
+          requires:
+          - osx-release-x64
+          - osx-release-x64-tests
+          - osx-verify-ffmpeg
+
+      - mas-release:
+          requires:
+            - mac-checkout-and-save-cache
+      - mas-release-tests:
+          requires:
+            - mas-release
+      - mas-verify-ffmpeg:
+          requires:
+            - mas-release
+      - mas-release-summary:
+          requires:
+          - mas-release
+          - mas-release-tests
+          - mas-verify-ffmpeg
+
   # Various slow and non-essential checks we run only nightly.
   # Sanitizer jobs should be added here.
   linux-checks-nightly:
@@ -2745,6 +2831,7 @@ workflows:
             branches:
               only:
                 - master
+                - *chromium-upgrade-branches
     jobs:
       - linux-checkout-for-native-tests
 

.github/CODEOWNERS

@@ -13,3 +13,9 @@ DEPS                                    @electron/wg-upgrades
 
 # Security WG
 /lib/browser/rpc-server.ts              @electron/wg-security
+
+# Remote Change Disliker
+/lib/browser/remote/                    @nornagon
+/lib/renderer/remote/                   @nornagon
+/lib/renderer/api/remote.ts             @nornagon
+/docs/api/remote.md                     @nornagon

.github/ISSUE_TEMPLATE/Bug_report.md

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

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.md

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

.github/ISSUE_TEMPLATE/mac_app_store_private_api_rejection.yml

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

.gitignore

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

.husky/.gitignore

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

.husky/pre-commit

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

.husky/pre-push

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

BUILD.gn

@@ -32,10 +32,6 @@ if (is_mac) {
   import("//ui/gl/features.gni")
   import("//v8/gni/v8.gni")
   import("build/rules.gni")
-
-  assert(
-      mac_deployment_target == "10.11.0",
-      "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
 if (is_linux) {
@@ -441,10 +437,7 @@ source_set("electron_lib") {
   }
 
   if (is_linux) {
-    deps += [
-      "//build/config/linux/gtk:gtkprint",
-      "//components/crash/content/browser",
-    ]
+    deps += [ "//components/crash/content/browser" ]
   }
 
   if (is_mac) {
@@ -516,6 +509,10 @@ source_set("electron_lib") {
     ]
     if (use_x11) {
       sources += filenames.lib_sources_linux_x11
+      deps += [
+        "//ui/gfx/x",
+        "//ui/gtk/x",
+      ]
     }
     configs += [ ":gio_unix" ]
     defines += [
@@ -1164,6 +1161,11 @@ if (is_mac) {
         "//build/config/win:delayloads",
       ]
 
+      if (target_cpu == "arm64") {
+        configs -= [ "//build/config/win:cfi_linker" ]
+        ldflags += [ "/guard:cf,nolongjmp" ]
+      }
+
       if (current_cpu == "x86") {
         # Set the initial stack size to 0.5MiB, instead of the 1.5MiB needed by
         # Chrome's main thread. This saves significant memory on threads (like

DEPS

@@ -14,9 +14,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '92.0.4499.0',
+    '91.0.4472.33',
   'node_version':
-    'v14.16.1',
+    'v14.16.0',
   'nan_version':
     'v2.14.2',
   'squirrel.mac_version':
@@ -88,7 +88,7 @@ deps = {
     'url': (Var("nodejs_git")) + '/node.git@' + (Var("node_version")),
     'condition': 'checkout_node and process_deps',
   },
-  'src/third_party/pyyaml': {
+  'src/electron/vendor/pyyaml': {
     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
     'condition': 'checkout_pyyaml and process_deps',
   },

ELECTRON_VERSION

@@ -1 +1 @@
-14.0.0-nightly.20210510
+13.0.0-beta.21

build/dump_syms.py

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

build/webpack/webpack.config.base.js

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

build/zip.py

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

buildflags/BUILD.gn

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

buildflags/buildflags.gni

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

chromium_src/chrome/browser/process_singleton.h

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

default_app/default_app.ts

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

docs/README.md

@@ -59,7 +59,6 @@ an issue:
   * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
   * [Performance Strategies](tutorial/performance.md)
   * [Security Strategies](tutorial/security.md)
-  * [Process Sandboxing](tutorial/sandbox.md)
 * [Accessibility](tutorial/accessibility.md)
   * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
 * [Testing and Debugging](tutorial/application-debugging.md)

docs/api/app.md

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

docs/api/auto-updater.md

@@ -118,9 +118,6 @@ Returns `String` - The current update feed URL.
 Asks the server whether there is an update. You must call `setFeedURL` before
 using this API.
 
-**Note:** If an update is available it will be downloaded automatically.
-Calling `autoUpdater.checkForUpdates()` twice will download the update two times.
-
 ### `autoUpdater.quitAndInstall()`
 
 Restarts the app and installs the update after it has been downloaded. It

docs/api/browser-window.md

@@ -14,7 +14,7 @@ const win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 
 // Or load a local HTML file
-win.loadFile('index.html')
+win.loadURL(`file://${__dirname}/app/index.html`)
 ```
 
 ## Frameless window
@@ -272,7 +272,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       associated with the window, making it compatible with the Chromium
       OS-level sandbox and disabling the Node.js engine. This is not the same as
       the `nodeIntegration` option and the APIs available to the preload script
-      are more limited. Read more about the option [here](../tutorial/sandbox.md).
+      are more limited. Read more about the option [here](sandbox-option.md).
+    * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
+      Default is `false`.
     * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
       page. Instead of passing the Session object directly, you can also choose to
       use the `partition` option instead, which accepts a partition string. When
@@ -284,6 +286,13 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       same `partition`. If there is no `persist:` prefix, the page will use an
       in-memory session. By assigning the same `partition`, multiple pages can share
       the same session. Default is the default session.
+    * `affinity` String (optional) - When specified, web pages with the same
+      `affinity` will run in the same renderer process. Note that due to reusing
+      the renderer process, certain `webPreferences` options will also be shared
+      between the web pages even when you specified different values for them,
+      including but not limited to `preload`, `sandbox` and `nodeIntegration`.
+      So it is suggested to use exact same `webPreferences` for web pages with
+      the same `affinity`. _Deprecated_
     * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
       `300%`. Default is `1.0`.
     * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -330,7 +339,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       more details.
     * `contextIsolation` Boolean (optional) - Whether to run Electron APIs and
       the specified `preload` script in a separate JavaScript context. Defaults
-      to `true`. The context that the `preload` script runs in will only have
+      to `false`. The context that the `preload` script runs in will only have
       access to its own dedicated `document` and `window` globals, as well as
       its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.),
       which are all invisible to the loaded content. The Electron API will only
@@ -341,9 +350,13 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       [Chrome Content Scripts][chrome-content-scripts].  You can access this
       context in the dev tools by selecting the 'Electron Isolated Context'
       entry in the combo box at the top of the Console tab.
+    * `worldSafeExecuteJavaScript` Boolean (optional) - If true, values returned from `webFrame.executeJavaScript` will be sanitized to ensure JS values
+      can't unsafely cross between worlds when using `contextIsolation`.  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 `true`. Child windows will always have node
-      integration disabled unless `nodeIntegrationInSubFrames` is true.
+      `window.open()`. Defaults to `false`. Child windows will always have node
+      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently
+      experimental.
     * `webviewTag` Boolean (optional) - Whether to enable the [`<webview>` tag](webview-tag.md).
       Defaults to `false`. **Note:** The
       `preload` script configured for the `<webview>` will have node integration
@@ -750,10 +763,6 @@ A `Boolean` property that determines whether the window is in simple (pre-Lion)
 
 A `Boolean` property that determines whether the window is in fullscreen mode.
 
-#### `win.focusable` _Windows_ _macOS_
-
-A `Boolean` property that determines whether the window is focusable.
-
 #### `win.visibleOnAllWorkspaces`
 
 A `Boolean` property that determines whether the window is visible on all workspaces.
@@ -1373,7 +1382,7 @@ Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer URL.
   * `userAgent` String (optional) - A user agent originating the request.
   * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData](structures/upload-raw-data.md) | [UploadFile](structures/upload-file.md))[] (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
   * `baseURLForDataURL` String (optional) - Base URL (with trailing path separator) for files to be loaded by the data URL. This is needed only if the specified `url` is a data URL and needs to load other files.
 
 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1672,10 +1681,6 @@ Changes whether the window can be focused.
 
 On macOS it does not remove the focus from the window.
 
-#### `win.isFocusable()` _macOS_ _Windows_
-
-Returns whether the window can be focused.
-
 #### `win.setParentWindow(parent)`
 
 * `parent` BrowserWindow | null

docs/api/command-line-switches.md

@@ -66,6 +66,11 @@ Forces the maximum disk space to be used by the disk cache, in bytes.
 Enables caller stack logging for the following APIs (filtering events):
 
 * `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+* `remote.require()` / `remote-require`
+* `remote.getGlobal()` / `remote-get-builtin`
+* `remote.getBuiltin()` / `remote-get-global`
+* `remote.getCurrentWindow()` / `remote-get-current-window`
+* `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
 
 ### --enable-logging
 
@@ -137,8 +142,7 @@ proxy server flags that are passed.
 
 ### --no-sandbox
 
-Disables the Chromium [sandbox](https://www.chromium.org/developers/design-documents/sandbox).
-Forces renderer process and Chromium helper processes to run un-sandboxed.
+Disables Chromium sandbox, which is now enabled by default.
 Should only be used for testing.
 
 ### --proxy-bypass-list=`hosts`

docs/api/dialog.md

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

docs/api/power-monitor.md

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

docs/api/remote.md

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

docs/api/sandbox-option.md

@@ -0,0 +1,182 @@
+# `sandbox` Option
+
+> Create a browser window with a sandboxed renderer. With this
+option enabled, the renderer must communicate via IPC to the main process in order to access node APIs.
+
+One of the key security features of Chromium is that all blink rendering/JavaScript
+code is executed within a sandbox. This sandbox uses OS-specific features to ensure
+that exploits in the renderer process cannot harm the system.
+
+In other words, when the sandbox is enabled, the renderers can only make changes
+to the system by delegating tasks to the main process via IPC.
+[Here's](https://www.chromium.org/developers/design-documents/sandbox) more
+information about the sandbox.
+
+Since a major feature in Electron is the ability to run Node.js in the
+renderer process (making it easier to develop desktop applications using web
+technologies), the sandbox is disabled by electron. This is because
+most Node.js APIs require system access. `require()` for example, is not
+possible without file system permissions, which are not available in a sandboxed
+environment.
+
+Usually this is not a problem for desktop applications since the code is always
+trusted, but it makes Electron less secure than Chromium for displaying
+untrusted web content. For applications that require more security, the
+`sandbox` flag will force Electron to spawn a classic Chromium renderer that is
+compatible with the sandbox.
+
+A sandboxed renderer doesn't have a Node.js environment running and doesn't
+expose Node.js JavaScript APIs to client code. The only exception is the preload script,
+which has access to a subset of the Electron renderer API.
+
+Another difference is that sandboxed renderers don't modify any of the default
+JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
+do in Chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
+
+## Example
+
+To create a sandboxed window, pass `sandbox: true` to `webPreferences`:
+
+```js
+let win
+app.whenReady().then(() => {
+  win = new BrowserWindow({
+    webPreferences: {
+      sandbox: true
+    }
+  })
+  win.loadURL('http://google.com')
+})
+```
+
+In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
+only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
+within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
+and returns a proxy to this via `window.open`).
+
+[`app.enableSandbox`](app.md#appenablesandbox) can be used to force `sandbox: true` for all `BrowserWindow` instances.
+
+```js
+let win
+app.enableSandbox()
+app.whenReady().then(() => {
+  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
+  win = new BrowserWindow()
+  win.loadURL('http://google.com')
+})
+```
+
+## Preload
+
+An app can make customizations to sandboxed renderers using a preload script.
+Here's an example:
+
+```js
+let win
+app.whenReady().then(() => {
+  win = new BrowserWindow({
+    webPreferences: {
+      sandbox: true,
+      preload: path.join(app.getAppPath(), 'preload.js')
+    }
+  })
+  win.loadURL('http://google.com')
+})
+```
+
+and preload.js:
+
+```js
+// This file is loaded whenever a javascript context is created. It runs in a
+// private scope that can access a subset of Electron renderer APIs. Without
+// contextIsolation enabled, it's possible to accidentally leak privileged
+// globals like ipcRenderer to web content.
+const { ipcRenderer } = require('electron')
+
+const defaultWindowOpen = window.open
+
+window.open = function customWindowOpen (url, ...args) {
+  ipcRenderer.send('report-window-open', location.origin, url, args)
+  return defaultWindowOpen(url + '?from_electron=1', ...args)
+}
+```
+
+Important things to notice in the preload script:
+
+- Even though the sandboxed renderer doesn't have Node.js running, it still has
+  access to a limited node-like environment: `Buffer`, `process`, `setImmediate`,
+  `clearImmediate` and `require` are available.
+- The preload script must be contained in a single script, but it is possible to have
+  complex preload code composed with multiple modules by using a tool like
+  webpack or browserify. An example of using browserify is below.
+
+To create a browserify bundle and use it as a preload script, something like
+the following should be used:
+
+```sh
+  browserify preload/index.js \
+    -x electron \
+    --insert-global-vars=__filename,__dirname -o preload.js
+```
+
+The `-x` flag should be used with any required module that is already exposed in
+the preload scope, and tells browserify to use the enclosing `require` function
+for it. `--insert-global-vars` will ensure that `process`, `Buffer` and
+`setImmediate` are also taken from the enclosing scope(normally browserify
+injects code for those).
+
+Currently the `require` function provided in the preload scope exposes the
+following modules:
+
+- `electron`
+  - `crashReporter`
+  - `desktopCapturer`
+  - `ipcRenderer`
+  - `nativeImage`
+  - `webFrame`
+- `events`
+- `timers`
+- `url`
+
+More may be added as needed to expose more Electron APIs in the sandbox.
+
+## Rendering untrusted content
+
+Rendering untrusted content in Electron is still somewhat uncharted territory,
+though some apps are finding success (e.g. Beaker Browser). Our goal is to get
+as close to Chrome as we can in terms of the security of sandboxed content, but
+ultimately we will always be behind due to a few fundamental issues:
+
+1. We do not have the dedicated resources or expertise that Chromium has to
+   apply to the security of its product. We do our best to make use of what we
+   have, to inherit everything we can from Chromium, and to respond quickly to
+   security issues, but Electron cannot be as secure as Chromium without the
+   resources that Chromium is able to dedicate.
+2. Some security features in Chrome (such as Safe Browsing and Certificate
+   Transparency) require a centralized authority and dedicated servers, both of
+   which run counter to the goals of the Electron project. As such, we disable
+   those features in Electron, at the cost of the associated security they
+   would otherwise bring.
+3. There is only one Chromium, whereas there are many thousands of apps built
+   on Electron, all of which behave slightly differently. Accounting for those
+   differences can yield a huge possibility space, and make it challenging to
+   ensure the security of the platform in unusual use cases.
+4. We can't push security updates to users directly, so we rely on app vendors
+   to upgrade the version of Electron underlying their app in order for
+   security updates to reach users.
+
+Here are some things to consider before rendering untrusted content:
+
+- A preload script can accidentally leak privileged APIs to untrusted code,
+  unless [`contextIsolation`](../tutorial/security.md#3-enable-context-isolation-for-remote-content)
+  is also enabled.
+- Some bug in the V8 engine may allow malicious code to access the renderer
+  preload APIs, effectively granting full access to the system through the
+  `remote` module. Therefore, it is highly recommended to [disable the `remote`
+  module](../tutorial/security.md#15-disable-the-remote-module).
+  If disabling is not feasible, you should selectively [filter the `remote`
+  module](../tutorial/security.md#16-filter-the-remote-module).
+- While we make our best effort to backport Chromium security fixes to older
+  versions of Electron, we do not make a guarantee that every fix will be
+  backported. Your best chance at staying secure is to be on the latest stable
+  version of Electron.

docs/api/session.md

@@ -197,7 +197,9 @@ be managed by using [ses.setPermissionCheckHandler(handler)](#sessetpermissionch
 with the `serial` permission.
 
 Because this is an experimental feature it is disabled by default.  To enable this feature, you
-will need to use the `--enable-features=ElectronSerialChooser` command line switch.
+will need to use the `--enable-features=ElectronSerialChooser` command line switch.  Additionally
+because this is an experimental Chromium feature you will need to set `enableBlinkFeatures: 'Serial'`
+on the `webPreferences` property when opening a BrowserWindow.
 
 ```javascript
 const { app, BrowserWindow } = require('electron')
@@ -208,7 +210,10 @@ app.commandLine.appendSwitch('enable-features', 'ElectronSerialChooser')
 app.whenReady().then(() => {
   win = new BrowserWindow({
     width: 800,
-    height: 600
+    height: 600,
+    webPreferences: {
+      enableBlinkFeatures: 'Serial'
+    }
   })
   win.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
     event.preventDefault()

docs/api/structures/post-body.md

@@ -1,6 +1,6 @@
 # PostBody Object
 
-* `data` ([UploadRawData](upload-raw-data.md) | [UploadFile](upload-file.md))[] - The post data to be sent to the
+* `data` Array<[PostData](./post-data.md)> - The post data to be sent to the
   new window.
 * `contentType` String - The `content-type` header used for the data. One of
   `application/x-www-form-urlencoded` or `multipart/form-data`. Corresponds to

docs/api/structures/post-data.md

@@ -0,0 +1,21 @@
+# PostData Object
+
+* `type` String - One of the following:
+  * `rawData` - The data is available as a `Buffer`, in the `rawData` field.
+  * `file` - The object represents a file. The `filePath`, `offset`, `length`
+    and `modificationTime` fields will be used to describe the file.
+  * `blob` - The object represents a `Blob`. The `blobUUID` field will be used
+    to describe the `Blob`.
+* `bytes` String (optional) - The raw bytes of the post data in a `Buffer`.
+  Required for the `rawData` type.
+* `filePath` String (optional) - The path of the file being uploaded. Required
+  for the `file` type.
+* `blobUUID` String (optional) - The `UUID` of the `Blob` being uploaded.
+  Required for the `blob` type.
+* `offset` Integer (optional) - The offset from the beginning of the file being
+  uploaded, in bytes. Only valid for `file` types.
+* `length` Integer (optional) - The length of the file being uploaded, in bytes.
+  If set to `-1`, the whole file will be uploaded. Only valid for `file` types.
+* `modificationTime` Double (optional) - The modification time of the file
+  represented by a double, which is the number of seconds since the `UNIX Epoch`
+  (Jan 1, 1970). Only valid for `file` types.

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

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

docs/api/system-preferences.md

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

docs/api/web-contents.md

@@ -147,8 +147,7 @@ Returns:
 * `options` BrowserWindowConstructorOptions - The options which will be used for creating the new
   [`BrowserWindow`](browser-window.md).
 * `additionalFeatures` String[] - The non-standard features (features not handled
-  by Chromium or Electron) given to `window.open()`. Deprecated, and will now
-  always be the empty array `[]`.
+  by Chromium or Electron) given to `window.open()`.
 * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
   passed to the new window. May or may not result in the `Referer` header being
   sent, depending on the referrer policy.
@@ -203,11 +202,13 @@ Returns:
   * `frameName` String - Name given to the created window in the
      `window.open()` call.
   * `options` BrowserWindowConstructorOptions - The options used to create the
-    BrowserWindow. They are merged in increasing precedence: parsed options
-    from the `features` string from `window.open()`, security-related
-    webPreferences inherited from the parent, and options given by
+    BrowserWindow. They are merged in increasing precedence: options inherited
+    from the parent, parsed options from the `features` string from
+    `window.open()`, and options given by
     [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
     Unrecognized options are not filtered out.
+  * `additionalFeatures` String[] - The non-standard features (features not
+    handled Chromium or Electron) _Deprecated_
   * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
     passed to the new window. May or may not result in the `Referer` header
     being sent, depending on the referrer policy.
@@ -374,8 +375,6 @@ win.webContents.on('will-prevent-unload', (event) => {
 })
 ```
 
-**Note:** This will be emitted for `BrowserViews` but will _not_ be respected - this is because we have chosen not to tie the `BrowserView` lifecycle to its owning BrowserWindow should one exist per the [specification](https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event).
-
 #### Event: 'crashed' _Deprecated_
 
 Returns:
@@ -840,6 +839,59 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process.
 Calling `event.preventDefault()` will make it return empty sources.
 
+#### Event: 'remote-require' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `moduleName` String
+
+Emitted when `remote.require()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-global' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `globalName` String
+
+Emitted when `remote.getGlobal()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the global from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-builtin' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+* `moduleName` String
+
+Emitted when `remote.getBuiltin()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-current-window' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+
+Emitted when `remote.getCurrentWindow()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-current-web-contents' _Deprecated_
+
+Returns:
+
+* `event` IpcMainEvent
+
+Emitted when `remote.getCurrentWebContents()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the object from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 #### Event: 'preferred-size-changed'
 
 Returns:
@@ -862,7 +914,7 @@ in `webPreferences`.
   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
   * `userAgent` String (optional) - A user agent originating the request.
   * `extraHeaders` String (optional) - Extra headers separated by "\n".
-  * `postData` ([UploadRawData](structures/upload-raw-data.md) | [UploadFile](structures/upload-file.md))[] (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
 
 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1132,15 +1184,6 @@ Ignore application menu shortcuts while this web contents is focused.
     * `url` String - The _resolved_ version of the URL passed to `window.open()`. e.g. opening a window with `window.open('foo')` will yield something like `https://the-origin/the/current/path/foo`.
     * `frameName` String - Name of the window provided in `window.open()`
     * `features` String - Comma separated list of window features provided to `window.open()`.
-    * `disposition` String - Can be `default`, `foreground-tab`, `background-tab`,
-      `new-window`, `save-to-disk` or `other`.
-    * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
-      passed to the new window. May or may not result in the `Referer` header being
-      sent, depending on the referrer policy.
-    * `postBody` [PostBody](structures/post-body.md) (optional) - The post data that
-      will be sent to the new window, along with the appropriate headers that will
-      be set. If no post data is to be sent, the value will be `null`. Only defined
-      when the window is being created by a form that set `target=_blank`.
 
   Returns `{action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions}` - `deny` cancels the creation of the new
   window. `allow` will allow the new window to be created. Specifying `overrideBrowserWindowOptions` allows customization of the created window.
@@ -1148,11 +1191,8 @@ Ignore application menu shortcuts while this web contents is focused.
   without a recognized 'action' value will result in a console error and have
   the same effect as returning `{action: 'deny'}`.
 
-Called before creating a window a new window is requested by the renderer, e.g.
-by `window.open()`, a link with `target="_blank"`, shift+clicking on a link, or
-submitting a form with `<form target="_blank">`. See
-[`window.open()`](window-open.md) for more details and how to use this in
-conjunction with `did-create-window`.
+Called before creating a window when `window.open()` is called from the
+renderer. See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `did-create-window`.
 
 #### `contents.setAudioMuted(muted)`
 

docs/api/web-frame-main.md

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

docs/api/web-frame.md

@@ -62,11 +62,6 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```
 
-> **NOTE**: Visual zoom only applies to pinch-to-zoom behavior. Cmd+/-/0 zoom shortcuts are
-> controlled by the 'zoomIn', 'zoomOut', and 'resetZoom' MenuItem roles in the application
-> Menu. To disable shortcuts, manually [define the Menu](./menu.md#examples) and omit zoom roles
-> from the definition.
-
 ### `webFrame.setSpellCheckProvider(language, provider)`
 
 * `language` String

docs/api/webview-tag.md

@@ -5,7 +5,7 @@
 Electron's `webview` tag is based on [Chromium's `webview`][chrome-webview], which
 is undergoing dramatic architectural changes. This impacts the stability of `webviews`,
 including rendering, navigation, and event routing. We currently recommend to not
-use the `webview` tag and to consider alternatives, like `iframe`, [Electron's `BrowserView`](browser-view.md),
+use the `webview` tag and to consider alternatives, like `iframe`, Electron's `BrowserView`,
 or an architecture that avoids embedded content altogether.
 
 ## Enabling
@@ -130,6 +130,15 @@ inside the `webview`. All your preloads will load for every iframe, you can
 use `process.isMainFrame` to determine if you are in the main frame or not.
 This option is disabled by default in the guest page.
 
+### `enableremotemodule`
+
+```html
+<webview src="http://www.google.com/" enableremotemodule="false"></webview>
+```
+
+A `Boolean`. When this attribute is `false` the guest page in `webview` will not have access
+to the [`remote`](remote.md) module. The remote module is unavailable by default.
+
 ### `plugins`
 
 ```html
@@ -265,7 +274,7 @@ webview.addEventListener('dom-ready', () => {
   * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
   * `userAgent` String (optional) - A user agent originating the request.
   * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData](structures/upload-raw-data.md) | [UploadFile](structures/upload-file.md))[] (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
   * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.
 
 Returns `Promise<void>` - The promise will resolve when the page has finished loading

docs/api/window-open.md

@@ -6,15 +6,16 @@ untrusted content within a renderer. Windows can be created from the renderer in
 * clicking on links or submitting forms adorned with `target=_blank`
 * JavaScript calling `window.open()`
 
-For same-origin content, the new window is created within the same process,
-enabling the parent to access the child window directly. This can be very
-useful for app sub-windows that act as preference panels, or similar, as the
-parent can render to the sub-window directly, as if it were a `div` in the
-parent. This is the same behavior as in the browser.
+In non-sandboxed renderers, or when `nativeWindowOpen` is false (the default), this results in the creation of a
+[`BrowserWindowProxy`](browser-window-proxy.md), a light wrapper around
+`BrowserWindow`.
 
-When `nativeWindowOpen` is set to false, `window.open` instead results in the
-creation of a [`BrowserWindowProxy`](browser-window-proxy.md), a light wrapper
-around `BrowserWindow`.
+However, when the `sandbox` (or directly, `nativeWindowOpen`) option is set, a
+`Window` instance is created, as you'd expect in the browser. For same-origin
+content, the new window is created within the same process, enabling the parent
+to access the child window directly. This can be very useful for app sub-windows that act
+as preference panels, or similar, as the parent can render to the sub-window
+directly, as if it were a `div` in the parent.
 
 Electron pairs this native Chrome `Window` with a BrowserWindow under the hood.
 You can take advantage of all the customization available when creating a
@@ -22,8 +23,9 @@ BrowserWindow in the main process by using `webContents.setWindowOpenHandler()`
 for renderer-created windows.
 
 BrowserWindow constructor options are set by, in increasing precedence
-order: parsed options from the `features` string from `window.open()`,
-security-related webPreferences inherited from the parent, and options given by
+order: options inherited from the parent, parsed options
+from the `features` string from `window.open()`, security-related webPreferences
+inherited from the parent, and options given by
 [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
 Note that `webContents.setWindowOpenHandler` has final say and full privilege
 because it is invoked in the main process.
@@ -62,23 +64,53 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
   the parent window.
 * Non-standard features (that are not handled by Chromium or Electron) given in
   `features` will be passed to any registered `webContents`'s
-  `did-create-window` event handler in the `options` argument.
-* `frameName` follows the specification of `windowName` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
+  `did-create-window` event handler in the `additionalFeatures` argument.
 
 To customize or cancel the creation of the window, you can optionally set an
 override handler with `webContents.setWindowOpenHandler()` from the main
-process. Returning `{ action: 'deny' }` cancels the window. Returning `{
-action: 'allow', overrideBrowserWindowOptions: { ... } }` will allow opening
-the window and setting the `BrowserWindowConstructorOptions` to be used when
-creating the window. Note that this is more powerful than passing options
-through the feature string, as the renderer has more limited privileges in
-deciding security preferences than the main process.
+process. Returning `false` cancels the window, while returning an object sets
+the `BrowserWindowConstructorOptions` used when creating the window. Note that
+this is more powerful than passing options through the feature string, as the
+renderer has more limited privileges in deciding security preferences than the
+main process.
+
+### `BrowserWindowProxy` example
+
+```javascript
+
+// main.js
+const mainWindow = new BrowserWindow()
+
+mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+  if (url.startsWith('https://github.com/')) {
+    return { action: 'allow' }
+  }
+  return { action: 'deny' }
+})
+
+mainWindow.webContents.on('did-create-window', (childWindow) => {
+  // For example...
+  childWindow.webContents('will-navigate', (e) => {
+    e.preventDefault()
+  })
+})
+```
+
+```javascript
+// renderer.js
+const windowProxy = window.open('https://github.com/', null, 'minimizable=false')
+windowProxy.postMessage('hi', '*')
+```
 
 ### Native `Window` example
 
 ```javascript
 // main.js
-const mainWindow = new BrowserWindow()
+const mainWindow = new BrowserWindow({
+  webPreferences: {
+    nativeWindowOpen: true
+  }
+})
 
 // In this example, only windows with the `about:blank` url will be created.
 // All other urls will be blocked.
@@ -102,33 +134,3 @@ mainWindow.webContents.setWindowOpenHandler(({ url }) => {
 const childWindow = window.open('', 'modal')
 childWindow.document.write('<h1>Hello</h1>')
 ```
-
-### `BrowserWindowProxy` example
-
-```javascript
-
-// main.js
-const mainWindow = new BrowserWindow({
-  webPreferences: { nativeWindowOpen: false }
-})
-
-mainWindow.webContents.setWindowOpenHandler(({ url }) => {
-  if (url.startsWith('https://github.com/')) {
-    return { action: 'allow' }
-  }
-  return { action: 'deny' }
-})
-
-mainWindow.webContents.on('did-create-window', (childWindow) => {
-  // For example...
-  childWindow.webContents.on('will-navigate', (e) => {
-    e.preventDefault()
-  })
-})
-```
-
-```javascript
-// renderer.js
-const windowProxy = window.open('https://github.com/', null, 'minimizable=false')
-windowProxy.postMessage('hi', '*')
-```

docs/breaking-changes.md

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

docs/development/pull-requests.md

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

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

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

docs/tutorial/code-signing.md

@@ -190,6 +190,7 @@ it may be worth your time to shop around. Popular resellers include:
 
 * [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
 * [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+* [GoDaddy](https://au.godaddy.com/web-security/code-signing-certificate)
 * Amongst others, please shop around to find one that suits your needs, Google
   is your friend 😄
 

docs/tutorial/recent-documents.md

@@ -83,22 +83,6 @@ following code snippet to your menu template:
 }
 ```
 
-Make sure the application menu is added after the [`'ready'`](../api/app.md#event-ready)
-event and not before, or the menu item will be disabled:
-
-```javascript
-const { app, Menu } = require('electron')
-
-const template = [
-  // Menu template here
-]
-const menu = Menu.buildFromTemplate(template)
-
-app.whenReady().then(() => {
-  Menu.setApplicationMenu(menu)
-})
-```
-
 ![macOS Recent Documents menu item][menu-item-image]
 
 When a file is requested from the recent documents menu, the `open-file` event

docs/tutorial/sandbox.md

@@ -1,169 +0,0 @@
-# Process Sandboxing
-
-One key security feature in Chromium is that processes can be executed within a sandbox.
-The sandbox limits the harm that malicious code can cause by limiting access to most
-system resources — sandboxed processes can only freely use CPU cycles and memory.
-In order to perform operations requiring additional privilege, sandboxed processes
-use dedicated communication channels to delegate tasks to more privileged processes.
-
-In Chromium, sandboxing is applied to most processes other than the main process.
-This includes renderer processes, as well as utility processes such as the audio service,
-the GPU service and the network service.
-
-See Chromium's [Sandbox design document][sandbox] for more information.
-
-## Electron's sandboxing policies
-
-Electron comes with a mixed sandbox environment, meaning sandboxed processes can run
-alongside privileged ones. By default, renderer processes are not sandboxed, but
-utility processes are. Note that as in Chromium, the main (browser) process is
-privileged and cannot be sandboxed.
-
-Historically, this mixed sandbox approach was established because having Node.js available
-in the renderer is an extremely powerful tool for app developers. Unfortunately, this
-feature is also an equally massive security vulnerability.
-
-Theoretically, unsandboxed renderers are not a problem for desktop applications that
-only display trusted code, but they make Electron less secure than Chromium for
-displaying untrusted web content. However, even purportedly trusted code may be
-dangerous — there are countless attack vectors that malicious actors can use, from
-cross-site scripting to content injection to man-in-the-middle attacks on remotely loaded
-websites, just to name a few. For this reason, we recommend enabling renderer sandboxing
-for the vast majority of cases under an abundance of caution.
-
-<!--TODO: update this guide when #28466 is either solved or closed -->
-Note that there is an active discussion in the issue tracker to enable renderer sandboxing
-by default. See [#28466][issue-28466]) for details.
-
-## Sandbox behaviour in Electron
-
-Sandboxed processes in Electron behave _mostly_ in the same way as Chromium's do, but
-Electron has a few additional concepts to consider because it interfaces with Node.js.
-
-### Renderer processes
-
-When renderer processes in Electron are sandboxed, they behave in the same way as a
-regular Chrome renderer would. A sandboxed renderer won't have a Node.js
-environment initialized.
-
-<!-- TODO(erickzhao): when we have a solid guide for IPC, link it here -->
-Therefore, when the sandbox is enabled, renderer processes can only perform privileged
-tasks (such as interacting with the filesystem, making changes to the system, or spawning
-subprocesses) by delegating these tasks to the main process via inter-process
-communication (IPC).
-
-### Preload scripts
-
-In order to allow renderer processes to communicate with the main process, preload
-scripts attached to sandboxed renderers will still have a polyfilled subset of Node.js
-APIs available. A `require` function similar to Node's `require` module is exposed,
-but can only import a subset of Electron and Node's built-in modules:
-
-* `electron` (only renderer process modules)
-* [`events`](https://nodejs.org/api/events.html)
-* [`timers`](https://nodejs.org/api/timers.html)
-* [`url`](https://nodejs.org/api/url.html)
-
-In addition, the preload script also polyfills certain Node.js primitives as globals:
-
-* [`Buffer`](https://nodejs.org/api/Buffer.html)
-* [`process`](../api/process.md)
-* [`clearImmediate`](https://nodejs.org/api/timers.html#timers_clearimmediate_immediate)
-* [`setImmediate`](https://nodejs.org/api/timers.html#timers_setimmediate_callback_args)
-
-Because the `require` function is a polyfill with limited functionality, you will not be
-able to use [CommonJS modules][commonjs] to separate your preload script into multiple
-files. If you need to split your preload code, use a bundler such as [webpack][webpack]
-or [Parcel][parcel].
-
-Note that because the environment presented to the `preload` script is substantially
-more privileged than that of a sandboxed renderer, it is still possible to leak
-privileged APIs to untrusted code running in the renderer process unless
-[`contextIsolation`][contextIsolation] is enabled.
-
-## Configuring the sandbox
-
-### Enabling the sandbox for a single process
-
-In Electron, renderer sandboxing can be enabled on a per-process basis with
-the `sandbox: true` preference in the [`BrowserWindow`][browser-window] constructor.
-
-```js
-// main.js
-app.whenReady().then(() => {
-  const win = new BrowserWindow({
-    webPreferences: {
-      sandbox: true
-    }
-  })
-  win.loadURL('https://google.com')
-})
-```
-
-### Enabling the sandbox globally
-
-If you want to force sandboxing for all renderers, you can also use the
-[`app.enableSandbox`][enable-sandbox] API. Note that this API has to be called before the
-app's `ready` event.
-
-```js
-// main.js
-app.enableSandbox()
-app.whenReady().then(() => {
-  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
-  const win = new BrowserWindow()
-  win.loadURL('https://google.com')
-})
-```
-
-### Disabling Chromium's sandbox (testing only)
-
-You can also disable Chromium's sandbox entirely with the [`--no-sandbox`][no-sandbox]
-CLI flag, which will disable the sandbox for all processes (including utility processes).
-We highly recommend that you only use this flag for testing purposes, and **never**
-in production.
-
-Note that the `sandbox: true` option will still disable the renderer's Node.js
-environment.
-
-## A note on rendering untrusted content
-
-Rendering untrusted content in Electron is still somewhat uncharted territory,
-though some apps are finding success (e.g. [Beaker Browser][beaker]).
-Our goal is to get as close to Chrome as we can in terms of the security of
-sandboxed content, but ultimately we will always be behind due to a few fundamental
-issues:
-
-1. We do not have the dedicated resources or expertise that Chromium has to
-   apply to the security of its product. We do our best to make use of what we
-   have, to inherit everything we can from Chromium, and to respond quickly to
-   security issues, but Electron cannot be as secure as Chromium without the
-   resources that Chromium is able to dedicate.
-2. Some security features in Chrome (such as Safe Browsing and Certificate
-   Transparency) require a centralized authority and dedicated servers, both of
-   which run counter to the goals of the Electron project. As such, we disable
-   those features in Electron, at the cost of the associated security they
-   would otherwise bring.
-3. There is only one Chromium, whereas there are many thousands of apps built
-   on Electron, all of which behave slightly differently. Accounting for those
-   differences can yield a huge possibility space, and make it challenging to
-   ensure the security of the platform in unusual use cases.
-4. We can't push security updates to users directly, so we rely on app vendors
-   to upgrade the version of Electron underlying their app in order for
-   security updates to reach users.
-
-While we make our best effort to backport Chromium security fixes to older
-versions of Electron, we do not make a guarantee that every fix will be
-backported. Your best chance at staying secure is to be on the latest stable
-version of Electron.
-
-[sandbox]: https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md
-[issue-28466]: https://github.com/electron/electron/issues/28466
-[browser-window]: ../api/browser-window.md
-[enable-sandbox]: ../api/app.md#appenablesandbox
-[no-sandbox]: ../api/command-line-switches.md#--no-sandbox
-[commonjs]: https://nodejs.org/api/modules.html#modules_modules_commonjs_modules
-[webpack]: https://webpack.js.org/
-[parcel]: https://parceljs.org/
-[context-isolation]: ./context-isolation.md
-[beaker]: https://github.com/beakerbrowser/beaker

docs/tutorial/security.md

@@ -692,5 +692,5 @@ which potential security issues are not as widely known.
 [window-open-handler]: ../api/web-contents.md#contentssetwindowopenhandlerhandler
 [will-navigate]: ../api/web-contents.md#event-will-navigate
 [open-external]: ../api/shell.md#shellopenexternalurl-options
-[sandbox]: ../tutorial/sandbox.md
+[sandbox]: ../api/sandbox-option.md
 [responsible-disclosure]: https://en.wikipedia.org/wiki/Responsible_disclosure

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

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

filenames.auto.gni

@@ -42,6 +42,8 @@ auto_filenames = {
     "docs/api/power-save-blocker.md",
     "docs/api/process.md",
     "docs/api/protocol.md",
+    "docs/api/remote.md",
+    "docs/api/sandbox-option.md",
     "docs/api/screen.md",
     "docs/api/service-workers.md",
     "docs/api/session.md",
@@ -102,6 +104,7 @@ auto_filenames = {
     "docs/api/structures/notification-response.md",
     "docs/api/structures/point.md",
     "docs/api/structures/post-body.md",
+    "docs/api/structures/post-data.md",
     "docs/api/structures/printer-info.md",
     "docs/api/structures/process-memory-info.md",
     "docs/api/structures/process-metric.md",
@@ -127,26 +130,33 @@ auto_filenames = {
     "docs/api/structures/upload-data.md",
     "docs/api/structures/upload-file.md",
     "docs/api/structures/upload-raw-data.md",
-    "docs/api/structures/user-default-types.md",
     "docs/api/structures/web-source.md",
   ]
 
   sandbox_bundle_deps = [
+    "lib/browser/api/module-names.ts",
+    "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
+    "lib/common/api/module-list.ts",
+    "lib/common/api/shell.ts",
     "lib/common/define-properties.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
     "lib/common/web-view-methods.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/desktop-capturer.ts",
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/inspector.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/renderer/security-warnings.ts",
     "lib/renderer/web-frame-init.ts",
     "lib/renderer/web-view/guest-view-internal.ts",
@@ -230,6 +240,9 @@ auto_filenames = {
     "lib/browser/ipc-main-internal-utils.ts",
     "lib/browser/ipc-main-internal.ts",
     "lib/browser/message-port-main.ts",
+    "lib/browser/navigation-controller.ts",
+    "lib/browser/remote/objects-registry.ts",
+    "lib/browser/remote/server.ts",
     "lib/browser/rpc-server.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
@@ -239,6 +252,7 @@ auto_filenames = {
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
     "lib/common/parse-features-string.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
@@ -254,6 +268,7 @@ auto_filenames = {
   ]
 
   renderer_bundle_deps = [
+    "lib/browser/api/module-names.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
@@ -261,10 +276,12 @@ auto_filenames = {
     "lib/common/define-properties.ts",
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
     "lib/common/web-view-events.ts",
     "lib/common/web-view-methods.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
@@ -273,11 +290,13 @@ auto_filenames = {
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/init.ts",
     "lib/renderer/inspector.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/renderer/security-warnings.ts",
     "lib/renderer/web-frame-init.ts",
     "lib/renderer/web-view/guest-view-internal.ts",
@@ -295,6 +314,7 @@ auto_filenames = {
   ]
 
   worker_bundle_deps = [
+    "lib/browser/api/module-names.ts",
     "lib/common/api/clipboard.ts",
     "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
@@ -302,8 +322,10 @@ auto_filenames = {
     "lib/common/define-properties.ts",
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
+    "lib/common/remote/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/type-utils.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/common/webpack-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
@@ -312,9 +334,11 @@ auto_filenames = {
     "lib/renderer/api/ipc-renderer.ts",
     "lib/renderer/api/module-list.ts",
     "lib/renderer/api/native-image.ts",
+    "lib/renderer/api/remote.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/remote/callbacks-registry.ts",
     "lib/worker/init.ts",
     "package.json",
     "tsconfig.electron.json",

lib/browser/api/app.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { Menu } from 'electron/main';
+import { deprecate, Menu } from 'electron/main';
 
 const bindings = process._linkedBinding('electron_browser_app');
 const commandLine = process._linkedBinding('electron_common_command_line');
@@ -132,3 +132,7 @@ for (const name of events) {
     webContents.emit(name, event, ...args);
   });
 }
+
+// Deprecate allowRendererProcessReuse but only if they set it to false, no need to log if
+// they are setting it to true
+deprecate.removeProperty({ __proto__: app } as any, 'allowRendererProcessReuse', [false]);

lib/browser/api/base-window.ts

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

lib/browser/api/crash-reporter.ts

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

lib/browser/api/dialog.ts

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

lib/browser/api/module-names.ts

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

lib/browser/api/web-contents.ts

@@ -3,7 +3,8 @@ import type { BrowserWindowConstructorOptions, LoadURLOptions } from 'electron/m
 
 import * as url from 'url';
 import * as path from 'path';
-import { openGuestWindow, makeWebPreferences, parseContentTypeFormat } from '@electron/internal/browser/guest-window-manager';
+import { openGuestWindow, makeWebPreferences } from '@electron/internal/browser/guest-window-manager';
+import { NavigationController } from '@electron/internal/browser/navigation-controller';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
@@ -60,7 +61,7 @@ const PDFPageSizes: Record<string, ElectronInternal.MediaSize> = {
     width_microns: 279400,
     custom_display_name: 'Tabloid'
   }
-} as const;
+};
 
 // The minimum micron size Chromium accepts is that where:
 // Per printing/units.h:
@@ -109,7 +110,7 @@ const defaultPrintingSetting = {
   printerType: 2,
   title: undefined as string | undefined,
   url: undefined as string | undefined
-} as const;
+};
 
 // JavaScript implementations of WebContents.
 const binding = process._linkedBinding('electron_browser_web_contents');
@@ -191,7 +192,7 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId
 
 let pendingPromise: Promise<any> | undefined;
 WebContents.prototype.printToPDF = async function (options) {
-  const printSettings: Record<string, any> = {
+  const printSettings = {
     ...defaultPrintingSetting,
     requestID: getNextId()
   };
@@ -406,89 +407,15 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
   }));
 };
 
-WebContents.prototype.loadURL = function (url, options) {
-  if (!options) {
-    options = {};
-  }
-
-  const p = new Promise<void>((resolve, reject) => {
-    const resolveAndCleanup = () => {
-      removeListeners();
-      resolve();
-    };
-    const rejectAndCleanup = (errorCode: number, errorDescription: string, url: string) => {
-      const err = new Error(`${errorDescription} (${errorCode}) loading '${typeof url === 'string' ? url.substr(0, 2048) : url}'`);
-      Object.assign(err, { errno: errorCode, code: errorDescription, url });
-      removeListeners();
-      reject(err);
-    };
-    const finishListener = () => {
-      resolveAndCleanup();
-    };
-    const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
-      if (isMainFrame) {
-        rejectAndCleanup(errorCode, errorDescription, validatedURL);
-      }
-    };
-
-    let navigationStarted = false;
-    const navigationListener = (event: Electron.Event, url: string, isSameDocument: boolean, isMainFrame: boolean) => {
-      if (isMainFrame) {
-        if (navigationStarted && !isSameDocument) {
-          // the webcontents has started another unrelated navigation in the
-          // main frame (probably from the app calling `loadURL` again); reject
-          // the promise
-          // We should only consider the request aborted if the "navigation" is
-          // actually navigating and not simply transitioning URL state in the
-          // current context.  E.g. pushState and `location.hash` changes are
-          // considered navigation events but are triggered with isSameDocument.
-          // We can ignore these to allow virtual routing on page load as long
-          // as the routing does not leave the document
-          return rejectAndCleanup(-3, 'ERR_ABORTED', url);
-        }
-        navigationStarted = true;
-      }
-    };
-    const stopLoadingListener = () => {
-      // By the time we get here, either 'finish' or 'fail' should have fired
-      // if the navigation occurred. However, in some situations (e.g. when
-      // attempting to load a page with a bad scheme), loading will stop
-      // without emitting finish or fail. In this case, we reject the promise
-      // with a generic failure.
-      // TODO(jeremy): enumerate all the cases in which this can happen. If
-      // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
-      // would be more appropriate.
-      rejectAndCleanup(-2, 'ERR_FAILED', url);
-    };
-    const removeListeners = () => {
-      this.removeListener('did-finish-load', finishListener);
-      this.removeListener('did-fail-load', failListener);
-      this.removeListener('did-start-navigation', navigationListener);
-      this.removeListener('did-stop-loading', stopLoadingListener);
-      this.removeListener('destroyed', stopLoadingListener);
-    };
-    this.on('did-finish-load', finishListener);
-    this.on('did-fail-load', failListener);
-    this.on('did-start-navigation', navigationListener);
-    this.on('did-stop-loading', stopLoadingListener);
-    this.on('destroyed', stopLoadingListener);
-  });
-  // Add a no-op rejection handler to silence the unhandled rejection error.
-  p.catch(() => {});
-  this._loadURL(url, options);
-  this.emit('load-url', url, options);
-  return p;
-};
-
 WebContents.prototype.setWindowOpenHandler = function (handler: (details: Electron.HandlerDetails) => ({action: 'allow'} | {action: 'deny', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions})) {
   this._windowOpenHandler = handler;
 };
 
-WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event, details: Electron.HandlerDetails): BrowserWindowConstructorOptions | null {
+WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event, url: string, frameName: string, rawFeatures: string): BrowserWindowConstructorOptions | null {
   if (!this._windowOpenHandler) {
     return null;
   }
-  const response = this._windowOpenHandler(details);
+  const response = this._windowOpenHandler({ url, frameName, features: rawFeatures });
 
   if (typeof response !== 'object') {
     event.preventDefault();
@@ -548,6 +475,24 @@ const loggingEnabled = () => {
 
 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
+  // The navigation controller.
+  const navigationController = new NavigationController(this);
+  this.loadURL = navigationController.loadURL.bind(navigationController);
+  this.getURL = navigationController.getURL.bind(navigationController);
+  this.stop = navigationController.stop.bind(navigationController);
+  this.reload = navigationController.reload.bind(navigationController);
+  this.reloadIgnoringCache = navigationController.reloadIgnoringCache.bind(navigationController);
+  this.canGoBack = navigationController.canGoBack.bind(navigationController);
+  this.canGoForward = navigationController.canGoForward.bind(navigationController);
+  this.canGoToIndex = navigationController.canGoToIndex.bind(navigationController);
+  this.canGoToOffset = navigationController.canGoToOffset.bind(navigationController);
+  this.clearHistory = navigationController.clearHistory.bind(navigationController);
+  this.goBack = navigationController.goBack.bind(navigationController);
+  this.goForward = navigationController.goForward.bind(navigationController);
+  this.goToIndex = navigationController.goToIndex.bind(navigationController);
+  this.goToOffset = navigationController.goToOffset.bind(navigationController);
+  this.getActiveIndex = navigationController.getActiveIndex.bind(navigationController);
+  this.length = navigationController.length.bind(navigationController);
   // Read off the ID at construction time, so that it's accessible even after
   // the underlying C++ WebContents is destroyed.
   const id = this.id;
@@ -558,6 +503,10 @@ WebContents.prototype._init = function () {
 
   this._windowOpenHandler = null;
 
+  // Every remote callback from renderer process would add a listener to the
+  // render-view-deleted event, so ignore the listeners warning.
+  this.setMaxListeners(0);
+
   // Dispatch IPC messages to the ipc module.
   this.on('-ipc-message' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, args: any[]) {
     addSenderFrameToEvent(event);
@@ -622,21 +571,9 @@ WebContents.prototype._init = function () {
 
   if (this.getType() !== 'remote') {
     // Make new windows requested by links behave like "window.open".
-    this.on('-new-window' as any, (event: ElectronInternal.Event, url: string, frameName: string, disposition: Electron.HandlerDetails['disposition'],
+    this.on('-new-window' as any, (event: ElectronInternal.Event, url: string, frameName: string, disposition: string,
       rawFeatures: string, referrer: Electron.Referrer, postData: PostData) => {
-      const postBody = postData ? {
-        data: postData,
-        ...parseContentTypeFormat(postData)
-      } : undefined;
-      const details: Electron.HandlerDetails = {
-        url,
-        frameName,
-        features: rawFeatures,
-        referrer,
-        postBody,
-        disposition
-      };
-      const options = this._callWindowOpenHandler(event, details);
+      const options = this._callWindowOpenHandler(event, url, frameName, rawFeatures);
       if (!event.defaultPrevented) {
         openGuestWindow({
           event,
@@ -645,26 +582,18 @@ WebContents.prototype._init = function () {
           referrer,
           postData,
           overrideBrowserWindowOptions: options || {},
-          windowOpenArgs: details
+          windowOpenArgs: {
+            url,
+            frameName,
+            features: rawFeatures
+          }
         });
       }
     });
 
     let windowOpenOverriddenOptions: BrowserWindowConstructorOptions | null = null;
-    this.on('-will-add-new-contents' as any, (event: ElectronInternal.Event, url: string, frameName: string, rawFeatures: string, disposition: Electron.HandlerDetails['disposition'], referrer: Electron.Referrer, postData: PostData) => {
-      const postBody = postData ? {
-        data: postData,
-        ...parseContentTypeFormat(postData)
-      } : undefined;
-      const details: Electron.HandlerDetails = {
-        url,
-        frameName,
-        features: rawFeatures,
-        disposition,
-        referrer,
-        postBody
-      };
-      windowOpenOverriddenOptions = this._callWindowOpenHandler(event, details);
+    this.on('-will-add-new-contents' as any, (event: ElectronInternal.Event, url: string, frameName: string, rawFeatures: string) => {
+      windowOpenOverriddenOptions = this._callWindowOpenHandler(event, url, frameName, rawFeatures);
       if (!event.defaultPrevented) {
         const secureOverrideWebPreferences = windowOpenOverriddenOptions ? {
           // Allow setting of backgroundColor as a webPreference even though

lib/browser/desktop-capturer.ts

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

lib/browser/guest-view-manager.ts

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

lib/browser/guest-window-manager.ts

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

lib/browser/guest-window-proxy.ts

@@ -73,15 +73,14 @@ ipcMainInternal.on(
       );
     }
 
-    const referrer: Electron.Referrer = { url: '', policy: 'strict-origin-when-cross-origin' };
-    const browserWindowOptions = event.sender._callWindowOpenHandler(event, { url, frameName, features, disposition: 'new-window', referrer });
+    const browserWindowOptions = event.sender._callWindowOpenHandler(event, url, frameName, features);
     if (event.defaultPrevented) {
       return;
     }
     const guest = openGuestWindow({
       event,
       embedder: event.sender,
-      referrer,
+      referrer: { url: '', policy: 'default' },
       disposition: 'new-window',
       overrideBrowserWindowOptions: browserWindowOptions!,
       windowOpenArgs: {
@@ -135,7 +134,7 @@ handleMessage(
 
     if (!windowMethods.has(method)) {
       console.error(
-        `Blocked ${event.senderFrame.url} from calling method: ${method}`
+        `Blocked ${event.sender.getURL()} from calling method: ${method}`
       );
       throw new Error(`Invalid method: ${method}`);
     }

lib/browser/init.ts

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

lib/browser/navigation-controller.ts

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

lib/browser/remote/objects-registry.ts

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

lib/browser/remote/server.ts

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

lib/browser/rpc-server.ts

@@ -7,8 +7,6 @@ import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-util
 import * as typeUtils from '@electron/internal/common/type-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as desktopCapturerModule from '@electron/internal/browser/desktop-capturer';
-
 const eventBinding = process._linkedBinding('electron_browser_event');
 
 const emitCustomEvent = function (contents: WebContents, eventName: string, ...args: any[]) {
@@ -60,7 +58,7 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, function (event, me
 });
 
 if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  const desktopCapturer = require('@electron/internal/browser/desktop-capturer') as typeof desktopCapturerModule;
+  const desktopCapturer = require('@electron/internal/browser/desktop-capturer');
 
   ipcMainInternal.handle(IPC_MESSAGES.DESKTOP_CAPTURER_GET_SOURCES, async function (event, options: Electron.SourcesOptions, stack: string) {
     logStack(event.sender, 'desktopCapturer.getSources()', stack);
@@ -71,7 +69,7 @@ if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
       return [];
     }
 
-    return typeUtils.serialize(await desktopCapturer.getSourcesImpl(event.sender, options));
+    return typeUtils.serialize(await desktopCapturer.getSourcesImpl(event, options));
   });
 }
 
@@ -102,6 +100,22 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD, async function (event
   };
 });
 
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_BACK, function (event) {
+  event.sender.goBack();
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_FORWARD, function (event) {
+  event.sender.goForward();
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_TO_OFFSET, function (event, offset) {
+  event.sender.goToOffset(offset);
+});
+
+ipcMainInternal.on(IPC_MESSAGES.NAVIGATION_CONTROLLER_LENGTH, function (event) {
+  event.returnValue = event.sender.length();
+});
+
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadPath: string, error: Error) {
   event.sender.emit('preload-error', event, preloadPath, error);
 });

lib/common/api/clipboard.ts

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

lib/common/ipc-messages.ts

@@ -29,6 +29,11 @@ export const enum IPC_MESSAGES {
 
   RENDERER_WEB_FRAME_METHOD = 'RENDERER_WEB_FRAME_METHOD',
 
+  NAVIGATION_CONTROLLER_GO_BACK = 'NAVIGATION_CONTROLLER_GO_BACK',
+  NAVIGATION_CONTROLLER_GO_FORWARD = 'NAVIGATION_CONTROLLER_GO_FORWARD',
+  NAVIGATION_CONTROLLER_GO_TO_OFFSET = 'NAVIGATION_CONTROLLER_GO_TO_OFFSET',
+  NAVIGATION_CONTROLLER_LENGTH = 'NAVIGATION_CONTROLLER_LENGTH',
+
   INSPECTOR_CONFIRM = 'INSPECTOR_CONFIRM',
   INSPECTOR_CONTEXT_MENU = 'INSPECTOR_CONTEXT_MENU',
   INSPECTOR_SELECT_FILE = 'INSPECTOR_SELECT_FILE',

lib/common/parse-features-string.ts

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

lib/common/remote/types.ts

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

lib/common/web-view-events.ts

@@ -1,4 +1,4 @@
-export const webViewEvents: Record<string, readonly string[]> = {
+export const webViewEvents: Record<string, string[]> = {
   'load-commit': ['url', 'isMainFrame'],
   'did-attach': [],
   'did-finish-load': [],
@@ -18,7 +18,7 @@ export const webViewEvents: Record<string, readonly string[]> = {
   'did-navigate': ['url', 'httpResponseCode', 'httpStatusText'],
   'did-frame-navigate': ['url', 'httpResponseCode', 'httpStatusText', 'isMainFrame', 'frameProcessId', 'frameRoutingId'],
   'did-navigate-in-page': ['url', 'isMainFrame', 'frameProcessId', 'frameRoutingId'],
-  '-focus-change': ['focus'],
+  'focus-change': ['focus', 'guestInstanceId'],
   close: [],
   crashed: [],
   'render-process-gone': ['details'],
@@ -33,4 +33,4 @@ export const webViewEvents: Record<string, readonly string[]> = {
   'found-in-page': ['result'],
   'did-change-theme-color': ['themeColor'],
   'update-target-url': ['url']
-} as const;
+};

lib/isolated_renderer/init.ts

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

lib/renderer/api/context-bridge.ts

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

lib/renderer/api/module-list.ts

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

lib/renderer/api/remote.ts

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

lib/renderer/api/web-frame.ts

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

lib/renderer/init.ts

@@ -1,12 +1,6 @@
 import * as path from 'path';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as webFrameInitModule from '@electron/internal/renderer/web-frame-init';
-import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';
-import type * as windowSetupModule from '@electron/internal/renderer/window-setup';
-import type * as securityWarningsModule from '@electron/internal/renderer/security-warnings';
-
 const Module = require('module');
 
 // Make sure globals like "process" and "global" are always available in preload
@@ -49,7 +43,7 @@ const v8Util = process._linkedBinding('electron_common_v8_util');
 const contextId = v8Util.getHiddenValue<string>(global, 'contextId');
 Object.defineProperty(process, 'contextId', { enumerable: true, value: contextId });
 
-const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
+const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal');
 const ipcRenderer = require('@electron/internal/renderer/api/ipc-renderer').default;
 
 v8Util.setHiddenValue(global, 'ipcNative', {
@@ -64,22 +58,23 @@ v8Util.setHiddenValue(global, 'ipcNative', {
 });
 
 // Use electron module after everything is ready.
-const { webFrameInit } = require('@electron/internal/renderer/web-frame-init') as typeof webFrameInitModule;
+const { webFrameInit } = require('@electron/internal/renderer/web-frame-init');
 webFrameInit();
 
 // Process command line arguments.
 const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');
-const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
 
-const contextIsolation = mainFrame.getWebPreference('contextIsolation');
-const nodeIntegration = mainFrame.getWebPreference('nodeIntegration');
-const webviewTag = mainFrame.getWebPreference('webviewTag');
-const isHiddenPage = mainFrame.getWebPreference('hiddenPage');
-const usesNativeWindowOpen = mainFrame.getWebPreference('nativeWindowOpen');
-const preloadScript = mainFrame.getWebPreference('preload');
-const preloadScripts = mainFrame.getWebPreference('preloadScripts');
-const guestInstanceId = mainFrame.getWebPreference('guestInstanceId');
-const openerId = mainFrame.getWebPreference('openerId');
+const contextIsolation = getWebPreference(window, 'contextIsolation');
+const nodeIntegration = getWebPreference(window, 'nodeIntegration');
+const webviewTag = getWebPreference(window, 'webviewTag');
+const isHiddenPage = getWebPreference(window, 'hiddenPage');
+const usesNativeWindowOpen = getWebPreference(window, 'nativeWindowOpen');
+const rendererProcessReuseEnabled = getWebPreference(window, 'disableElectronSiteInstanceOverrides');
+const preloadScript = getWebPreference(window, 'preload');
+const preloadScripts = getWebPreference(window, 'preloadScripts');
+const guestInstanceId = getWebPreference(window, 'guestInstanceId') || null;
+const openerId = getWebPreference(window, 'openerId') || null;
 const appPath = hasSwitch('app-path') ? getSwitchValue('app-path') : null;
 
 // The webContents preload script is loaded after the session preload scripts.
@@ -101,14 +96,14 @@ switch (window.location.protocol) {
   }
   default: {
     // Override default web functions.
-    const { windowSetup } = require('@electron/internal/renderer/window-setup') as typeof windowSetupModule;
-    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen);
+    const { windowSetup } = require('@electron/internal/renderer/window-setup');
+    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen, rendererProcessReuseEnabled);
   }
 }
 
 // Load webview tag implementation.
 if (process.isMainFrame) {
-  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init') as typeof webViewInitModule;
+  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init');
   webViewInit(contextIsolation, webviewTag, guestInstanceId);
 }
 
@@ -193,6 +188,6 @@ for (const preloadScript of preloadScripts) {
 
 // Warn about security issues
 if (process.isMainFrame) {
-  const { securityWarnings } = require('@electron/internal/renderer/security-warnings') as typeof securityWarningsModule;
+  const { securityWarnings } = require('@electron/internal/renderer/security-warnings');
   securityWarnings(nodeIntegration);
 }

lib/renderer/remote/callbacks-registry.ts

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

lib/renderer/security-warnings.ts

@@ -78,7 +78,8 @@ const isLocalhost = function () {
  * @returns {boolean} Is a CSP with `unsafe-eval` set?
  */
 const isUnsafeEvalEnabled: () => Promise<boolean> = function () {
-  return webFrame.executeJavaScript(`(${(() => {
+  // Call _executeJavaScript to bypass the world-safe deprecation warning
+  return webFrame._executeJavaScript(`(${(() => {
     try {
       eval(window.trustedTypes.emptyScript); // eslint-disable-line no-eval
     } catch {
@@ -265,6 +266,27 @@ const warnAboutAllowedPopups = function () {
 //   #13 Disable or limit creation of new windows
 //   #14 Do not use `openExternal` with untrusted content
 
+// #15 on the checklist: Disable the `remote` module
+// Logs a warning message about the remote module
+
+const warnAboutRemoteModuleWithRemoteContent = function (webPreferences?: Electron.WebPreferences) {
+  if (!webPreferences || isLocalhost()) return;
+  const remoteModuleEnabled = webPreferences.enableRemoteModule != null ? !!webPreferences.enableRemoteModule : true;
+  if (!remoteModuleEnabled) return;
+
+  if (getIsRemoteProtocol()) {
+    const warning = `This renderer process has "enableRemoteModule" enabled
+    and attempted to load remote content from '${window.location}'. This
+    exposes users of this app to unnecessary security risks.\n${moreInformation}`;
+
+    console.warn('%cElectron Security Warning (enableRemoteModule)',
+      'font-weight: bold;', warning);
+  }
+};
+
+// Currently missing since we can't easily programmatically check for it:
+//   #16 Filter the `remote` module
+
 const logSecurityWarnings = function (
   webPreferences: Electron.WebPreferences | undefined, nodeIntegration: boolean
 ) {
@@ -276,6 +298,7 @@ const logSecurityWarnings = function (
   warnAboutEnableBlinkFeatures(webPreferences);
   warnAboutInsecureCSP();
   warnAboutAllowedPopups();
+  warnAboutRemoteModuleWithRemoteContent(webPreferences);
 };
 
 const getWebPreferences = async function () {
@@ -286,7 +309,7 @@ const getWebPreferences = async function () {
   }
 };
 
-export function securityWarnings (nodeIntegration = false) {
+export function securityWarnings (nodeIntegration: boolean) {
   const loadHandler = async function () {
     if (shouldLogSecurityWarnings()) {
       const webPreferences = await getWebPreferences();

lib/renderer/web-frame-init.ts

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

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

@@ -8,7 +8,7 @@ import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const DEPRECATED_EVENTS: Record<string, string> = {
   'page-title-updated': 'page-title-set'
-} as const;
+};
 
 const dispatchEvent = function (
   webView: WebViewImpl, eventName: string, eventKey: string, ...args: Array<any>
@@ -26,7 +26,7 @@ const dispatchEvent = function (
 
   if (eventName === 'load-commit') {
     webView.onLoadCommit(props);
-  } else if (eventName === '-focus-change') {
+  } else if (eventName === 'focus-change') {
     webView.onFocusChange();
   }
 };
@@ -70,3 +70,10 @@ export function attachGuest (
 export function detachGuest (guestInstanceId: number) {
   return ipcRendererUtils.invokeSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_DETACH_GUEST, guestInstanceId);
 }
+
+export const guestViewInternalModule = {
+  deregisterEvents,
+  createGuest,
+  attachGuest,
+  detachGuest
+};

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

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

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

@@ -6,6 +6,7 @@ export const enum WEB_VIEW_CONSTANTS {
   ATTRIBUTE_HTTPREFERRER = 'httpreferrer',
   ATTRIBUTE_NODEINTEGRATION = 'nodeintegration',
   ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES = 'nodeintegrationinsubframes',
+  ATTRIBUTE_ENABLEREMOTEMODULE = 'enableremotemodule',
   ATTRIBUTE_PLUGINS = 'plugins',
   ATTRIBUTE_DISABLEWEBSECURITY = 'disablewebsecurity',
   ATTRIBUTE_ALLOWPOPUPS = 'allowpopups',
@@ -17,7 +18,7 @@ export const enum WEB_VIEW_CONSTANTS {
 
   // Error messages.
   ERROR_MSG_ALREADY_NAVIGATED = 'The object has already navigated, so its partition cannot be changed.',
+  ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview> = ' + 'Script cannot be injected into content until the page has loaded.',
   ERROR_MSG_INVALID_PARTITION_ATTRIBUTE = 'Invalid partition attribute.',
-  ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE = 'Only "file:" protocol is supported in "preload" attribute.',
-  ERROR_MSG_NOT_ATTACHED = 'The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.'
+  ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE = 'Only "file:" protocol is supported in "preload" attribute.'
 }

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

@@ -9,15 +9,15 @@
 // modules must be passed from outside, all included files must be plain JS.
 
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
-import type * as webViewImplModule from '@electron/internal/renderer/web-view/web-view-impl';
+import { WebViewImpl as IWebViewImpl, webViewImplModule } from '@electron/internal/renderer/web-view/web-view-impl';
 import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 
-const internals = new WeakMap<HTMLElement, webViewImplModule.WebViewImpl>();
-
 // Return a WebViewElement class that is defined in this context.
-const defineWebViewElement = (webViewImpl: typeof webViewImplModule) => {
+const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
   const { guestViewInternal, WebViewImpl } = webViewImpl;
   return class WebViewElement extends HTMLElement {
+    public internalInstanceId?: number;
+
     static get observedAttributes () {
       return [
         WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION,
@@ -29,6 +29,7 @@ const defineWebViewElement = (webViewImpl: typeof webViewImplModule) => {
         WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS,
         WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY,
         WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS,
+        WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE,
         WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD,
         WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES,
         WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES,
@@ -44,19 +45,11 @@ const defineWebViewElement = (webViewImpl: typeof webViewImplModule) => {
         Object.assign(event, props);
         return internal.webviewNode.dispatchEvent(event);
       };
-      internals.set(this, internal);
-    }
-
-    getWebContentsId () {
-      const internal = internals.get(this);
-      if (!internal || !internal.guestInstanceId) {
-        throw new Error(WEB_VIEW_CONSTANTS.ERROR_MSG_NOT_ATTACHED);
-      }
-      return internal.guestInstanceId;
+      v8Util.setHiddenValue(this, 'internal', internal);
     }
 
     connectedCallback () {
-      const internal = internals.get(this);
+      const internal = v8Util.getHiddenValue<IWebViewImpl>(this, 'internal');
       if (!internal) {
         return;
       }
@@ -68,14 +61,14 @@ const defineWebViewElement = (webViewImpl: typeof webViewImplModule) => {
     }
 
     attributeChangedCallback (name: string, oldValue: any, newValue: any) {
-      const internal = internals.get(this);
+      const internal = v8Util.getHiddenValue<IWebViewImpl>(this, 'internal');
       if (internal) {
         internal.handleWebviewAttributeMutation(name, oldValue, newValue);
       }
     }
 
     disconnectedCallback () {
-      const internal = internals.get(this);
+      const internal = v8Util.getHiddenValue<IWebViewImpl>(this, 'internal');
       if (!internal) {
         return;
       }
@@ -84,16 +77,17 @@ const defineWebViewElement = (webViewImpl: typeof webViewImplModule) => {
         guestViewInternal.detachGuest(internal.guestInstanceId);
       }
       internal.elementAttached = false;
+      this.internalInstanceId = 0;
       internal.reset();
     }
   };
 };
 
 // Register <webview> custom element.
-const registerWebViewElement = (webViewImpl: typeof webViewImplModule) => {
+const registerWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
   // I wish eslint wasn't so stupid, but it is
   // eslint-disable-next-line
-  const WebViewElement = defineWebViewElement(webViewImpl) as unknown as typeof ElectronInternal.WebViewElement
+  const WebViewElement = defineWebViewElement(v8Util, webViewImpl) as unknown as typeof ElectronInternal.WebViewElement
 
   webViewImpl.setupMethods(WebViewElement);
 
@@ -116,14 +110,15 @@ const registerWebViewElement = (webViewImpl: typeof webViewImplModule) => {
 };
 
 // Prepare to register the <webview> element.
-export const setupWebView = (webViewImpl: typeof webViewImplModule) => {
+export const setupWebView = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
   const useCapture = true;
   const listener = (event: Event) => {
     if (document.readyState === 'loading') {
       return;
     }
 
-    registerWebViewElement(webViewImpl);
+    webViewImpl.setupAttributes();
+    registerWebViewElement(v8Util, webViewImpl);
 
     window.removeEventListener(event.type, listener, useCapture);
   };

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

@@ -1,15 +1,14 @@
+import * as electron from 'electron';
+
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal';
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
 import type { WebViewAttribute, PartitionAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
-import { setupWebViewAttributes } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { deserialize } from '@electron/internal/common/type-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
-export { webFrame } from 'electron';
-export * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal';
+const { webFrame } = electron;
 
 const v8Util = process._linkedBinding('electron_common_v8_util');
 
@@ -35,7 +34,9 @@ export class WebViewImpl {
   public on: Record<string, any> = {}
   public internalElement: HTMLIFrameElement
 
-  public attributes: Map<string, WebViewAttribute>;
+  // Replaced in web-view-attributes
+  public attributes = new Map<string, WebViewAttribute>();
+  public setupWebViewAttributes (): void {}
 
   public dispatchEventInMainWorld?: (eventName: string, props: any) => boolean;
 
@@ -46,7 +47,7 @@ export class WebViewImpl {
     const style = shadowRoot.ownerDocument.createElement('style');
     style.textContent = ':host { display: flex; }';
     shadowRoot.appendChild(style);
-    this.attributes = setupWebViewAttributes(this);
+    this.setupWebViewAttributes();
     this.viewInstanceId = getNextId();
     shadowRoot.appendChild(this.internalElement);
 
@@ -64,7 +65,6 @@ export class WebViewImpl {
     iframeElement.style.flex = '1 1 auto';
     iframeElement.style.width = '100%';
     iframeElement.style.border = '0';
-    // used by RendererClientBase::IsWebViewFrame
     v8Util.setHiddenValue(iframeElement, 'internal', this);
     return iframeElement;
   }
@@ -162,7 +162,7 @@ export class WebViewImpl {
 
   // Emits focus/blur events.
   onFocusChange () {
-    const hasFocus = this.webviewNode.ownerDocument.activeElement === this.webviewNode;
+    const hasFocus = document.activeElement === this.webviewNode;
     if (hasFocus !== this.hasFocus) {
       this.hasFocus = hasFocus;
       this.dispatchEvent(hasFocus ? 'focus' : 'blur');
@@ -208,9 +208,21 @@ export class WebViewImpl {
   }
 }
 
+export const setupAttributes = () => {
+  require('@electron/internal/renderer/web-view/web-view-attributes');
+};
+
 // I wish eslint wasn't so stupid, but it is
 // eslint-disable-next-line
 export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElement) => {
+  WebViewElement.prototype.getWebContentsId = function () {
+    const internal = v8Util.getHiddenValue<WebViewImpl>(this, 'internal');
+    if (!internal.guestInstanceId) {
+      throw new Error('The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.');
+    }
+    return internal.guestInstanceId;
+  };
+
   // Focusing the webview should move page focus to the underlying iframe.
   WebViewElement.prototype.focus = function () {
     this.contentWindow.focus();
@@ -260,3 +272,11 @@ export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElem
     });
   }
 };
+
+export const webViewImplModule = {
+  setupAttributes,
+  setupMethods,
+  guestViewInternal,
+  webFrame,
+  WebViewImpl
+};

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

@@ -1,38 +1,37 @@
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as webViewImpl from '@electron/internal/renderer/web-view/web-view-impl';
-import type * as webViewElement from '@electron/internal/renderer/web-view/web-view-element';
-
 const v8Util = process._linkedBinding('electron_common_v8_util');
 
-function handleFocusBlur () {
+function handleFocusBlur (guestInstanceId: number) {
   // Note that while Chromium content APIs have observer for focus/blur, they
   // unfortunately do not work for webview.
 
   window.addEventListener('focus', () => {
-    ipcRendererInternal.send(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, true);
+    ipcRendererInternal.send(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, true, guestInstanceId);
   });
 
   window.addEventListener('blur', () => {
-    ipcRendererInternal.send(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, false);
+    ipcRendererInternal.send(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, false, guestInstanceId);
   });
 }
 
-export function webViewInit (contextIsolation: boolean, webviewTag: boolean, guestInstanceId: number) {
+export function webViewInit (
+  contextIsolation: boolean, webviewTag: ElectronInternal.WebViewElement, guestInstanceId: number
+) {
   // Don't allow recursive `<webview>`.
-  if (webviewTag && !guestInstanceId) {
-    const webViewImplModule = require('@electron/internal/renderer/web-view/web-view-impl') as typeof webViewImpl;
+  if (webviewTag && guestInstanceId == null) {
+    const { webViewImplModule } = require('@electron/internal/renderer/web-view/web-view-impl');
     if (contextIsolation) {
       v8Util.setHiddenValue(window, 'web-view-impl', webViewImplModule);
     } else {
-      const { setupWebView } = require('@electron/internal/renderer/web-view/web-view-element') as typeof webViewElement;
-      setupWebView(webViewImplModule);
+      const { setupWebView } = require('@electron/internal/renderer/web-view/web-view-element');
+      setupWebView(v8Util, webViewImplModule);
     }
   }
 
   if (guestInstanceId) {
     // Report focus/blur events of webview to browser.
-    handleFocusBlur();
+    handleFocusBlur(guestInstanceId);
   }
 }

lib/renderer/window-setup.ts

@@ -243,8 +243,9 @@ class BrowserWindowProxy {
 }
 
 export const windowSetup = (
-  guestInstanceId: number, openerId: number, isHiddenPage: boolean, usesNativeWindowOpen: boolean) => {
-  if (!process.sandboxed && !guestInstanceId) {
+  guestInstanceId: number, openerId: number, isHiddenPage: boolean, usesNativeWindowOpen: boolean, rendererProcessReuseEnabled: boolean
+) => {
+  if (!process.sandboxed && guestInstanceId == null) {
     // Override default window.close.
     window.close = function () {
       ipcRendererInternal.send(IPC_MESSAGES.BROWSER_WINDOW_CLOSE);
@@ -269,24 +270,7 @@ export const windowSetup = (
     if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueWithDynamicPropsFromIsolatedWorld(['open'], window.open);
   }
 
-  // If this window uses nativeWindowOpen, but its opener window does not, we
-  // need to proxy window.opener in order to let the page communicate with its
-  // opener.
-  // Additionally, windows opened from a nativeWindowOpen child of a
-  // non-nativeWindowOpen parent will initially have their WebPreferences
-  // copied from their opener before having them updated, meaning openerId is
-  // initially incorrect. We detect this situation by checking for
-  // window.opener, which will be non-null for a natively-opened child, so we
-  // can ignore the openerId in that case, since it's incorrectly copied from
-  // the parent. This is, uh, confusing, so here's a diagram that will maybe
-  // help?
-  //
-  // [ grandparent window ] --> [ parent window ] --> [ child window ]
-  //     n.W.O = false             n.W.O = true         n.W.O = true
-  //        id = 1                    id = 2               id = 3
-  //  openerId = 0              openerId = 1         openerId = 1  <- !!wrong!!
-  //    opener = null             opener = null        opener = [parent window]
-  if (openerId && !window.opener) {
+  if (openerId != null) {
     window.opener = getOrCreateProxy(openerId);
     if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueWithDynamicPropsFromIsolatedWorld(['opener'], window.opener);
   }
@@ -297,7 +281,7 @@ export const windowSetup = (
   };
   if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['prompt'], window.prompt);
 
-  if (!usesNativeWindowOpen || openerId) {
+  if (!usesNativeWindowOpen || openerId != null) {
     ipcRendererInternal.on(IPC_MESSAGES.GUEST_WINDOW_POSTMESSAGE, function (
       _event, sourceId: number, message: any, sourceOrigin: string
     ) {
@@ -318,7 +302,31 @@ export const windowSetup = (
     });
   }
 
-  if (guestInstanceId) {
+  if (!process.sandboxed && !rendererProcessReuseEnabled) {
+    window.history.back = function () {
+      ipcRendererInternal.send(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_BACK);
+    };
+    if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['history', 'back'], window.history.back);
+
+    window.history.forward = function () {
+      ipcRendererInternal.send(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_FORWARD);
+    };
+    if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['history', 'forward'], window.history.forward);
+
+    window.history.go = function (offset: number) {
+      ipcRendererInternal.send(IPC_MESSAGES.NAVIGATION_CONTROLLER_GO_TO_OFFSET, +offset);
+    };
+    if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['history', 'go'], window.history.go);
+
+    const getHistoryLength = () => ipcRendererInternal.sendSync(IPC_MESSAGES.NAVIGATION_CONTROLLER_LENGTH);
+    Object.defineProperty(window.history, 'length', {
+      get: getHistoryLength,
+      set () {}
+    });
+    if (contextIsolationEnabled) internalContextBridge.overrideGlobalPropertyFromIsolatedWorld(['history', 'length'], getHistoryLength);
+  }
+
+  if (guestInstanceId != null) {
     // Webview `document.visibilityState` tracks window visibility (and ignores
     // the actual <webview> element visibility) for backwards compatibility.
     // See discussion in #9178.

lib/sandboxed_renderer/api/module-list.ts

@@ -1,3 +1,7 @@
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
+
+const enableRemoteModule = getWebPreference(window, 'enableRemoteModule');
+
 export const moduleList: ElectronInternal.ModuleEntry[] = [
   {
     name: 'contextBridge',
@@ -33,3 +37,10 @@ if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
     loader: () => require('@electron/internal/renderer/api/desktop-capturer')
   });
 }
+
+if (BUILDFLAG(ENABLE_REMOTE_MODULE) && enableRemoteModule) {
+  moduleList.push({
+    name: 'remote',
+    loader: () => require('@electron/internal/renderer/api/remote')
+  });
+}

lib/sandboxed_renderer/init.ts

@@ -3,13 +3,6 @@
 import * as events from 'events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as webFrameInitModule from '@electron/internal/renderer/web-frame-init';
-import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';
-import type * as windowSetupModule from '@electron/internal/renderer/window-setup';
-import type * as securityWarningsModule from '@electron/internal/renderer/security-warnings';
-
 const { EventEmitter } = events;
 
 process._linkedBinding = binding.get;
@@ -27,8 +20,8 @@ for (const prop of Object.keys(EventEmitter.prototype) as (keyof typeof process)
 }
 Object.setPrototypeOf(process, EventEmitter.prototype);
 
-const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
-const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
+const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal');
+const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils');
 
 const { preloadScripts, process: processProps } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
 
@@ -75,7 +68,7 @@ v8Util.setHiddenValue(global, 'lifecycle', {
   }
 });
 
-const { webFrameInit } = require('@electron/internal/renderer/web-frame-init') as typeof webFrameInitModule;
+const { webFrameInit } = require('@electron/internal/renderer/web-frame-init');
 webFrameInit();
 
 // Pass different process object to the preload script.
@@ -120,7 +113,7 @@ function preloadRequire (module: string) {
 
 // Process command line arguments.
 const { hasSwitch } = process._linkedBinding('electron_common_command_line');
-const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
+const { getWebPreference } = process._linkedBinding('electron_renderer_web_frame');
 
 // Similar to nodes --expose-internals flag, this exposes _linkedBinding so
 // that tests can call it to get access to some test only bindings
@@ -128,12 +121,13 @@ if (hasSwitch('unsafely-expose-electron-internals-for-testing')) {
   preloadProcess._linkedBinding = process._linkedBinding;
 }
 
-const contextIsolation = mainFrame.getWebPreference('contextIsolation');
-const webviewTag = mainFrame.getWebPreference('webviewTag');
-const isHiddenPage = mainFrame.getWebPreference('hiddenPage');
+const contextIsolation = getWebPreference(window, 'contextIsolation');
+const webviewTag = getWebPreference(window, 'webviewTag');
+const isHiddenPage = getWebPreference(window, 'hiddenPage');
+const rendererProcessReuseEnabled = getWebPreference(window, 'disableElectronSiteInstanceOverrides');
 const usesNativeWindowOpen = true;
-const guestInstanceId = mainFrame.getWebPreference('guestInstanceId');
-const openerId = mainFrame.getWebPreference('openerId');
+const guestInstanceId = getWebPreference(window, 'guestInstanceId') || null;
+const openerId = getWebPreference(window, 'openerId') || null;
 
 switch (window.location.protocol) {
   case 'devtools:': {
@@ -149,14 +143,14 @@ switch (window.location.protocol) {
   }
   default: {
     // Override default web functions.
-    const { windowSetup } = require('@electron/internal/renderer/window-setup') as typeof windowSetupModule;
-    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen);
+    const { windowSetup } = require('@electron/internal/renderer/window-setup');
+    windowSetup(guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen, rendererProcessReuseEnabled);
   }
 }
 
 // Load webview tag implementation.
 if (process.isMainFrame) {
-  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init') as typeof webViewInitModule;
+  const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init');
   webViewInit(contextIsolation, webviewTag, guestInstanceId);
 }
 
@@ -196,6 +190,6 @@ for (const { preloadPath, preloadSrc, preloadError } of preloadScripts) {
 
 // Warn about security issues
 if (process.isMainFrame) {
-  const { securityWarnings } = require('@electron/internal/renderer/security-warnings') as typeof securityWarningsModule;
+  const { securityWarnings } = require('@electron/internal/renderer/security-warnings');
   securityWarnings();
 }

package.json

@@ -1,11 +1,11 @@
 {
   "name": "electron",
-  "version": "14.0.0-nightly.20210510",
+  "version": "13.0.0-beta.21",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
-    "@electron/docs-parser": "^0.11.0",
-    "@electron/typescript-definitions": "^8.9.0",
+    "@electron/docs-parser": "^0.10.1",
+    "@electron/typescript-definitions": "^8.8.0",
     "@octokit/auth-app": "^2.10.0",
     "@octokit/rest": "^18.0.3",
     "@primer/octicons": "^10.0.0",
@@ -47,7 +47,7 @@
     "folder-hash": "^2.1.1",
     "fs-extra": "^9.0.1",
     "got": "^6.3.0",
-    "husky": "^6.0.0",
+    "husky": "^2.2.0",
     "klaw": "^3.0.0",
     "lint": "^1.1.2",
     "lint-staged": "^10.2.11",
@@ -96,10 +96,8 @@
     "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
     "pre-flight": "pre-flight",
     "gn-check": "node ./script/gn-check.js",
-    "precommit": "lint-staged",
     "preinstall": "node -e 'process.exit(0)'",
     "prepack": "check-for-leaks",
-    "prepare": "husky install",
     "repl": "node ./script/start.js --interactive",
     "start": "node ./script/start.js",
     "test": "node ./script/spec-runner.js",
@@ -111,6 +109,12 @@
   "keywords": [
     "electron"
   ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "check-for-leaks"
+    }
+  },
   "lint-staged": {
     "*.{js,ts}": [
       "node script/lint.js --js --fix --only --"

patches/boringssl/.patches

@@ -1,3 +1,2 @@
 expose_ripemd160.patch
 expose_aes-cfb.patch
-expose_des-ede3.patch

patches/boringssl/expose_des-ede3.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Rose <nornagon@nornagon.net>
-Date: Wed, 24 Feb 2021 11:08:34 -0800
-Subject: expose des-ede3
-
-This should be upstreamed.
-
-diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
-index 588a4773437c311877f275bf3679f9688cda3c46..e771ed6589b4579cc35300d5b2a1b68d92e444f5 100644
---- a/crypto/cipher_extra/cipher_extra.c
-+++ b/crypto/cipher_extra/cipher_extra.c
-@@ -93,6 +93,8 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
-     return EVP_rc4();
-   } else if (OPENSSL_strcasecmp(name, "des-cbc") == 0) {
-     return EVP_des_cbc();
-+  } else if (OPENSSL_strcasecmp(name, "des-ede3") == 0) {
-+    return EVP_des_ede3();
-   } else if (OPENSSL_strcasecmp(name, "des-ede3-cbc") == 0 ||
-              // This is not a name used by OpenSSL, but tcpdump registers it
-              // with |EVP_add_cipher_alias|. Our |EVP_add_cipher_alias| is a
-diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
-index 84af06fc56e4aa72d4d48801d7c037add0221747..fe412e350f43ad20758025da6b9754952d164938 100644
---- a/decrepit/evp/evp_do_all.c
-+++ b/decrepit/evp/evp_do_all.c
-@@ -39,6 +39,7 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
-   callback(EVP_des_cbc(), "DES-CBC", NULL, arg);
-   callback(EVP_des_ecb(), "DES-ECB", NULL, arg);
-   callback(EVP_des_ede(), "DES-EDE", NULL, arg);
-+  callback(EVP_des_ede3(), "DES-EDE3", NULL, arg);
-   callback(EVP_des_ede_cbc(), "DES-EDE-CBC", NULL, arg);
-   callback(EVP_des_ede3_cbc(), "DES-EDE3-CBC", NULL, arg);
-   callback(EVP_rc2_cbc(), "RC2-CBC", NULL, arg);
-@@ -65,6 +66,7 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
-   callback(EVP_des_cbc(), "des-cbc", NULL, arg);
-   callback(EVP_des_ecb(), "des-ecb", NULL, arg);
-   callback(EVP_des_ede(), "des-ede", NULL, arg);
-+  callback(EVP_des_ede3(), "des-ede3", NULL, arg);
-   callback(EVP_des_ede_cbc(), "des-ede-cbc", NULL, arg);
-   callback(EVP_des_ede3_cbc(), "des-ede3-cbc", NULL, arg);
-   callback(EVP_rc2_cbc(), "rc2-cbc", NULL, arg);

patches/boringssl/expose_ripemd160.patch

@@ -22,7 +22,7 @@ index 311c5cba0e359a20b34ba6c7ee84c34b6068049f..c4638d40aab0a4b9612216d68cd7fb50
      // hash function when given a signature OID. To avoid unintended lax parsing
      // of hash OIDs, this is no longer supported for lookup by OID or NID.
 diff --git a/crypto/fipsmodule/digest/digests.c b/crypto/fipsmodule/digest/digests.c
-index f006ebbc53eea78ce0337a076a05285f22da7a18..7b9309f39a2e5dc6e61bb89e5d32b1766165f5a7 100644
+index 16daeba650e2390c168fb4998450ba5182815816..893dc93cb03bd4518afee795af44316b810fcb20 100644
 --- a/crypto/fipsmodule/digest/digests.c
 +++ b/crypto/fipsmodule/digest/digests.c
 @@ -63,6 +63,7 @@
@@ -33,7 +33,7 @@ index f006ebbc53eea78ce0337a076a05285f22da7a18..7b9309f39a2e5dc6e61bb89e5d32b176
  
  #include "internal.h"
  #include "../delocate.h"
-@@ -301,4 +302,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_md5_sha1) {
+@@ -293,4 +294,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_md5_sha1) {
    out->ctx_size = sizeof(MD5_SHA1_CTX);
  }
  

patches/chromium/.patches

@@ -88,6 +88,7 @@ crash_allow_disabling_compression_on_linux.patch
 allow_setting_secondary_label_via_simplemenumodel.patch
 feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
 fix_patch_out_profile_refs_in_accessibility_ui.patch
+remove_some_deps_that_do_not_work_on_arm64.patch
 fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
 skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
@@ -100,9 +101,9 @@ use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch
 fix_export_zlib_symbols.patch
 don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
 web_contents.patch
+fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
 disable_unload_metrics.patch
 fix_add_check_for_sandbox_then_result.patch
-extend_apply_webpreferences.patch
+moves_background_color_setter_of_webview_to_blinks_webprefs_logic.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_setter_for_browsermainloop_result_code.patch
-revert_roll_clang_llvmorg-13-init-7051-gdad5caa5-2.patch

patches/chromium/accelerator.patch

@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= should show as Ctrl-+
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index d6913b15149f773cad28b5e2278b0f80df3d2896..15f944c4bb2fde7241b643f6a979a81ebce844b1 100644
+index c44f3d3752025bd3f11db790a97a48e8ba856034..8e0c1446315823a391614b19aa2c4ba2e5faed0d 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -29,9 +29,9 @@ index d6913b15149f773cad28b5e2278b0f80df3d2896..15f944c4bb2fde7241b643f6a979a81e
  #include "ui/events/keycodes/keyboard_code_conversion.h"
 -#endif
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "ui/base/ui_base_features.h"
-@@ -233,7 +232,15 @@ std::u16string Accelerator::GetShortcutText() const {
+@@ -208,7 +207,15 @@ std::u16string Accelerator::GetShortcutText() const {
    shortcut = KeyCodeToName();
  #endif
  
@@ -47,7 +47,7 @@ index d6913b15149f773cad28b5e2278b0f80df3d2896..15f944c4bb2fde7241b643f6a979a81e
  #if defined(OS_WIN)
      // Our fallback is to try translate the key code to a regular character
      // unless it is one of digits (VK_0 to VK_9). Some keyboard
-@@ -242,21 +249,14 @@ std::u16string Accelerator::GetShortcutText() const {
+@@ -217,21 +224,14 @@ std::u16string Accelerator::GetShortcutText() const {
      // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
      // default zoom level), we leave VK_[0-9] alone without translation.
      wchar_t key;
@@ -75,7 +75,7 @@ index d6913b15149f773cad28b5e2278b0f80df3d2896..15f944c4bb2fde7241b643f6a979a81e
    }
  
  #if defined(OS_MAC)
-@@ -452,7 +452,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -427,7 +427,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
    // more information.
    if (IsCtrlDown())
      result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 7d9019b87c8a016a1393c29d2ecf9966aa8f575c..160522d6bebfd47400733267ff3d60b37fff7f17 100644
+index b3afa0e60f45a10cfe97b129996e1d9489b09a7d..24984b2be369908d72a9493ebb0fa0f9c3e5fc7e 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -237,6 +237,10 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -265,6 +265,10 @@ int GpuMain(const MainFunctionParams& parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index 7d9019b87c8a016a1393c29d2ecf9966aa8f575c..160522d6bebfd47400733267ff3d60b3
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -374,7 +378,6 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -402,7 +406,6 @@ int GpuMain(const MainFunctionParams& parameters) {
    }
  #endif
  
@@ -33,10 +33,10 @@ index 7d9019b87c8a016a1393c29d2ecf9966aa8f575c..160522d6bebfd47400733267ff3d60b3
      client->PostIOThreadCreated(gpu_process.io_task_runner());
  
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index 864ad090cae17f6a93466f9d2ca52b63341f40da..391848e407f6bfcb7ba8f8a652bb062ebd16e697 100644
+index 2231ce937692f567fd2d4661e4feea389e12203e..a281c7bd40dac0acf350d08683e7c71282a83e9a 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
-@@ -28,6 +28,10 @@ class CONTENT_EXPORT ContentGpuClient {
+@@ -31,6 +31,10 @@ class CONTENT_EXPORT ContentGpuClient {
   public:
    virtual ~ContentGpuClient() {}
  

patches/chromium/add_didinstallconditionalfeatures.patch

@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index fa860cddc22da75967796674e9b467f8c726a368..730c7ddd2838eb50f6f5f0676f0f16f7e1d09ad1 100644
+index 5a733f2086ec10d3010da52a2758e1748d1178e1..d8c7ef2e3c03f5275c1ed58849ec892f811165ef 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -127,6 +127,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -128,6 +128,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index fa860cddc22da75967796674e9b467f8c726a368..730c7ddd2838eb50f6f5f0676f0f16f7
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 50504820638367fc32e42583edad4f68d62a2526..abcfd464b8a92f65623bc4527123cc75ad38b712 100644
+index 580974507f1a3007564e43b75142772b690a22c5..8999d6bbb3acc55dbedc2b36cca03862614f139f 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4146,6 +4146,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4540,6 +4540,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 50504820638367fc32e42583edad4f68d62a2526..abcfd464b8a92f65623bc4527123cc75
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index e938059c6eeec92b4041cc136ffc1f341741c0f3..e517f7478c3dbacf6bf41dcc39476bc8609bddb6 100644
+index 74944d9fb6ba23c001217607bc9f07c65761b26c..7ffdbb65978239dff50403fedb5c0bcf4d00c231 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -578,6 +578,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -579,6 +579,8 @@ class CONTENT_EXPORT RenderFrameImpl
        blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index e938059c6eeec92b4041cc136ffc1f341741c0f3..e517f7478c3dbacf6bf41dcc39476bc8
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 1ee5bd6211dba9a59d349be233c8fb05c83e2d84..b734962ff402176c59babb70a31dced0ef52521c 100644
+index 883f83327a5b04ad56d82b91e1c7d8fa674324b1..2b7d8e13dcde8cd916c1d0a804883415b2b23a16 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -566,6 +566,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -570,6 +570,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -67,10 +67,10 @@ index 1ee5bd6211dba9a59d349be233c8fb05c83e2d84..b734962ff402176c59babb70a31dced0
    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                          int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index 83b81f4c1fd4232ee5c2b7b1b7b85424164f3acc..bdd4a0031af6f9c2b701979dd469867c018e5753 100644
+index 50aa1b94ac6aab922f570d78f06096226d428c33..7af7ad0b7ed50dfc1ac061a915d3a99291afaec4 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -187,6 +187,7 @@ void LocalWindowProxy::Initialize() {
+@@ -188,6 +188,7 @@ void LocalWindowProxy::Initialize() {
    }
  
    InstallConditionalFeatures();
@@ -79,10 +79,10 @@ index 83b81f4c1fd4232ee5c2b7b1b7b85424164f3acc..bdd4a0031af6f9c2b701979dd469867c
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 04bf36d07aa6417d01fb2c50ebb7da3e5832059a..c79a715ce209e04b2036d59224722a06a12c887a 100644
+index 44b4f8358fdf0f7a4e00d4ee83a2feea7b794831..7465839150f14856ce6c5e3d47959060cb9bdac8 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -291,6 +291,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -295,6 +295,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index 04bf36d07aa6417d01fb2c50ebb7da3e5832059a..c79a715ce209e04b2036d59224722a06
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index da23faf79a419abe2501402b906b448924b64198..c8aabdf4d0c0c8e621473c585793259db5d2a707 100644
+index 4d123e82b733cac98f0da49ca5b0424d7f17a301..c59ca72a29aedd83f6f029217c57c5246af28e70 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -272,6 +272,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,10 +110,10 @@ index da23faf79a419abe2501402b906b448924b64198..c8aabdf4d0c0c8e621473c585793259d
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 577a27be65807a23ac8a4f082999614122449281..1d39f184cec039486355f4e08854aa16e15e7cb5 100644
+index 76643c8cd72ca5730333bf8e16e65d82e691c0cb..2fb28ccbe9343de7835ec3b5c71c0c1bfdd7d744 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
+@@ -76,6 +76,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override;
@@ -123,10 +123,10 @@ index 577a27be65807a23ac8a4f082999614122449281..1d39f184cec039486355f4e08854aa16
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index e20a85d63590b3f9a6ab09cf7ccb4b9b9f43bba8..c8c4ba944f038c00e6aa9a679f8e12b1877d38fa 100644
+index 9f9e6c6188d1f108f584b1117a91fc3e9a5e38ab..05330ea84dc1555bcc9dd6fbbd63e97348b5664d 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -344,6 +344,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -343,6 +343,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}

patches/chromium/add_realloc.patch

@@ -27,10 +27,10 @@ index 210760801f1d027196111631d34bab3eb5a10792..cdfdf91841b5f2feb248b0c5890ddcfd
    free(data);
  }
 diff --git a/gin/array_buffer.h b/gin/array_buffer.h
-index aef43319737398848dc40a3ab2d9e959ebb399f6..3c6dbc1ec10666b35d68e107a7a694c59c78a59f 100644
+index 086371af29bd8c7520485125deddca411e8b978b..2c6886ddcc47019be4d552d4fddfc1c3d00cbca0 100644
 --- a/gin/array_buffer.h
 +++ b/gin/array_buffer.h
-@@ -20,6 +20,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -21,6 +21,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
   public:
    void* Allocate(size_t length) override;
    void* AllocateUninitialized(size_t length) override;
@@ -39,10 +39,10 @@ index aef43319737398848dc40a3ab2d9e959ebb399f6..3c6dbc1ec10666b35d68e107a7a694c5
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 54c0c689bcf1f68ebc11fc76f73d36c2439c7a0d..04fc1864937150f19945ec06a28f0601be286d0d 100644
+index 7f88acc40ec99f0ecd1b71270980ee6e0c3e203e..42cdbc706a33792859fece7741846c4cc922008a 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -698,6 +698,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -699,6 +699,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
      return result;
    }
  
@@ -54,10 +54,10 @@ index 54c0c689bcf1f68ebc11fc76f73d36c2439c7a0d..04fc1864937150f19945ec06a28f0601
      if (max_allocation_ != 0 && data)
        total_allocation_.fetch_sub(size, std::memory_order_relaxed);
 diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-index dd90a1e579578e6bfc7419634d8c5fecb32cd167..1881ec0194ef0f33a011109ba7870d7993fe4c27 100644
+index ec217020077613d72eee4b5c408bd5e9eda2ae47..7ab2fa4d00eca9d4896653e29c98654ff75d4306 100644
 --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
 +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
-@@ -148,6 +148,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
+@@ -149,6 +149,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
    return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
  }
  
@@ -70,10 +70,10 @@ index dd90a1e579578e6bfc7419634d8c5fecb32cd167..1881ec0194ef0f33a011109ba7870d79
    InstanceCounters::DecrementCounter(
        InstanceCounters::kArrayBufferContentsCounter);
 diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-index fcf19e6685686c1c4a40dea4869beccab9de9c03..8aeb0f8db579aa8100a01dedee66f778735e2a9c 100644
+index cce802e4fc94c258607bc943d9902e6d18173c44..4f7f4eaf005aac701360e567e6faca7f2e0ff3da 100644
 --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
 +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
-@@ -107,6 +107,7 @@ class CORE_EXPORT ArrayBufferContents {
+@@ -108,6 +108,7 @@ class CORE_EXPORT ArrayBufferContents {
    void CopyTo(ArrayBufferContents& other);
  
    static void* AllocateMemoryOrNull(size_t, InitializationPolicy);

patches/chromium/add_setter_for_browsermainloop_result_code.patch

@@ -10,10 +10,10 @@ valid use cases for setting custom exit codes of the main loop.  This
 exposes a simple setter that embedders can call.
 
 diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
-index 69b091698f04209af113af6c586ec8615ff52d41..c54ad51b6cf4b48c522ae79091697b5efa50673c 100644
+index e116a3de7fb765758793b3feecab2654193c3a96..0131d97a8b82d2339c99d1b1c6c3faeba2ae35ff 100644
 --- a/content/browser/browser_main_loop.h
 +++ b/content/browser/browser_main_loop.h
-@@ -168,6 +168,10 @@ class CONTENT_EXPORT BrowserMainLoop {
+@@ -167,6 +167,10 @@ class CONTENT_EXPORT BrowserMainLoop {
  
    int GetResultCode() const { return result_code_; }
  

patches/chromium/allow_in_process_windows_to_have_different_web_prefs.patch

@@ -8,17 +8,21 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 8a1315f7f89588bb21c6d3c21a7de7c07fed9679..2ad5dc0b70a2b0bf298866dd2b9515112d3583f0 100644
+index 1363ee73abdfb05f7ff422c75b975a9d74f7dd43..ec12fa7fa8069c5bf090302221f67a3c586428a9 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -148,6 +148,23 @@ WebPreferences::WebPreferences()
+@@ -148,6 +148,29 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
++
 +      // Begin Electron-specific WebPreferences.
++      disable_electron_site_instance_overrides(),
 +      background_color(base::EmptyString()),
 +      opener_id(0),
 +      context_isolation(false),
++      enable_remote_module(false),
++      world_safe_execute_javascript(false),
 +      guest_instance_id(0),
 +      hidden_page(false),
 +      offscreen(false),
@@ -26,17 +30,19 @@ index 8a1315f7f89588bb21c6d3c21a7de7c07fed9679..2ad5dc0b70a2b0bf298866dd2b951511
 +      native_window_open(false),
 +      node_integration(false),
 +      node_integration_in_worker(false),
++      node_leakage_in_renderers(false),
 +      node_integration_in_sub_frames(false),
 +      enable_spellcheck(false),
 +      enable_plugins(false),
 +      enable_websql(false),
 +      webview_tag(false),
 +      // End Electron-specific WebPreferences.
++
        cookie_enabled(true),
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index ab2d320a4073308c249821a060e870afc0dbc3a5..1799d27380c112d98e55e63b9dd842c78014c62a 100644
+index 7fa49dd367b28441c1395b11dfe8795dc230b7e3..32a0bd4831dfbb70d5c23617fbf40458b9ace164 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -24,6 +24,11 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -51,30 +57,36 @@ index ab2d320a4073308c249821a060e870afc0dbc3a5..1799d27380c112d98e55e63b9dd842c7
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -154,6 +159,21 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -154,6 +159,27 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
++
 +  // Begin Electron-specific WebPreferences.
++  out->disable_electron_site_instance_overrides = data.disable_electron_site_instance_overrides();
 +  out->opener_id = data.opener_id();
 +  out->context_isolation = data.context_isolation();
++  out->enable_remote_module = data.enable_remote_module();
++  out->world_safe_execute_javascript = data.world_safe_execute_javascript();
 +  out->guest_instance_id = data.guest_instance_id();
 +  out->hidden_page = data.hidden_page();
 +  out->offscreen = data.offscreen();
 +  out->native_window_open = data.native_window_open();
 +  out->node_integration = data.node_integration();
 +  out->node_integration_in_worker = data.node_integration_in_worker();
++  out->node_leakage_in_renderers = data.node_leakage_in_renderers();
 +  out->node_integration_in_sub_frames = data.node_integration_in_sub_frames();
 +  out->enable_spellcheck = data.enable_spellcheck();
 +  out->enable_plugins = data.enable_plugins();
 +  out->enable_websql = data.enable_websql();
 +  out->webview_tag = data.webview_tag();
-+  // End Electron-specific WebPreferences.s
++  // End Electron-specific WebPreferences.
++
    out->cookie_enabled = data.cookie_enabled();
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 6a7194fc499dd6c88b6e205853390dbd3dd09094..ecda2293dfb14225a3358509f170196fe2f4ff65 100644
+index c457698eba5dcc2dad1b0e674cb6785ffc666b5b..ecd1910993840d6605071e848d5675a4c0f97f5c 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -9,6 +9,7 @@
@@ -85,15 +97,18 @@ index 6a7194fc499dd6c88b6e205853390dbd3dd09094..ecda2293dfb14225a3358509f170196f
  #include "base/time/time.h"
  #include "build/build_config.h"
  #include "net/nqe/effective_connection_type.h"
-@@ -161,6 +162,25 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -161,6 +162,29 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
 +  // Begin Electron-specific WebPreferences.
 +  std::vector<base::FilePath> preloads;
++  bool disable_electron_site_instance_overrides;
 +  std::string background_color;
 +  int opener_id;
 +  bool context_isolation;
++  bool enable_remote_module;
++  bool world_safe_execute_javascript;
 +  int guest_instance_id;
 +  bool hidden_page;
 +  bool offscreen;
@@ -101,6 +116,7 @@ index 6a7194fc499dd6c88b6e205853390dbd3dd09094..ecda2293dfb14225a3358509f170196f
 +  bool native_window_open;
 +  bool node_integration;
 +  bool node_integration_in_worker;
++  bool node_leakage_in_renderers;
 +  bool node_integration_in_sub_frames;
 +  bool enable_spellcheck;
 +  bool enable_plugins;
@@ -112,7 +128,7 @@ index 6a7194fc499dd6c88b6e205853390dbd3dd09094..ecda2293dfb14225a3358509f170196f
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3a2387469 100644
+index e35980e72f5d74a2483f7c62acd1d4b5db7fc5ac..5c3015ee753f9f2697e863d0fd68adf09e1f370c 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -123,7 +139,7 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -446,6 +447,72 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -446,6 +447,88 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -132,6 +148,10 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3
 +    return r.preloads;
 +  }
 +
++  static bool disable_electron_site_instance_overrides(const blink::web_pref::WebPreferences& r) {
++    return r.disable_electron_site_instance_overrides;
++  }
++
 +  static const std::string& background_color(const blink::web_pref::WebPreferences& r) {
 +    return r.background_color;
 +  }
@@ -144,6 +164,14 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3
 +    return r.context_isolation;
 +  }
 +
++  static bool enable_remote_module(const blink::web_pref::WebPreferences& r) {
++    return r.enable_remote_module;
++  }
++
++  static bool world_safe_execute_javascript(const blink::web_pref::WebPreferences& r) {
++    return r.world_safe_execute_javascript;
++  }
++
 +  static int guest_instance_id(const blink::web_pref::WebPreferences& r) {
 +    return r.guest_instance_id;
 +  }
@@ -172,6 +200,10 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3
 +    return r.node_integration_in_worker;
 +  }
 +
++  static bool node_leakage_in_renderers(const blink::web_pref::WebPreferences& r) {
++    return r.node_leakage_in_renderers;
++  }
++
 +  static bool node_integration_in_sub_frames(const blink::web_pref::WebPreferences& r) {
 +    return r.node_integration_in_sub_frames;
 +  }
@@ -197,7 +229,7 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..5ca57b9b52de2b398ed19ae0e2ce5bf3
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index db9994ca72f244d6e626d8793ec0cc181a582ea4..234a3aabfa4e0aa3fb32bd18b33fce3d03ac57af 100644
+index 3e2aae1d92b1c60b725bc8386e1d304dfabe384c..fc8113ea2221660ac2bed4e85844a95f31fbedf1 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
@@ -208,15 +240,18 @@ index db9994ca72f244d6e626d8793ec0cc181a582ea4..234a3aabfa4e0aa3fb32bd18b33fce3d
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -212,6 +213,25 @@ struct WebPreferences {
+@@ -212,6 +213,29 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
 +  // Begin Electron-specific WebPreferences.
 +  array<mojo_base.mojom.FilePath> preloads;
++  bool disable_electron_site_instance_overrides;
 +  string background_color;
 +  int32 opener_id;
 +  bool context_isolation;
++  bool enable_remote_module;
++  bool world_safe_execute_javascript;
 +  int32 guest_instance_id;
 +  bool hidden_page;
 +  bool offscreen;
@@ -224,6 +259,7 @@ index db9994ca72f244d6e626d8793ec0cc181a582ea4..234a3aabfa4e0aa3fb32bd18b33fce3d
 +  bool native_window_open;
 +  bool node_integration;
 +  bool node_integration_in_worker;
++  bool node_leakage_in_renderers;
 +  bool node_integration_in_sub_frames;
 +  bool enable_spellcheck;
 +  bool enable_plugins;

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

@@ -6,7 +6,7 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
 This allows file:// URLs in workers to have a CSP.
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index ac6db8ff4afbfef3e7be4eb44cc1d1cb9e1cb374..ee28560023fc488d88a89623203132f2d5a1df89 100644
+index 870beea1249e10e59ead3d2777292deb2e559eb2..b8ab71e8395edfaa8cd8e56bbfcc315466239f06 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 @@ -366,7 +366,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
@@ -16,4 +16,4 @@ index ac6db8ff4afbfef3e7be4eb44cc1d1cb9e1cb374..ee28560023fc488d88a89623203132f2
 -      !response.CurrentRequestUrl().ProtocolIs("file") &&
        !response.CurrentRequestUrl().ProtocolIs("filesystem")) {
      content_security_policy_ = MakeGarbageCollected<ContentSecurityPolicy>();
-     content_security_policy_->AddPolicies(ParseContentSecurityPolicyHeaders(
+     content_security_policy_->DidReceiveHeaders(

patches/chromium/blink_file_path.patch

@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 4be6229d391db5a01c700948cc1524d85bf82fba..f34daaf19de75c54ea2790b97ab37b007b23298e 100644
+index e9707e037d0018677160ab3088467dd5de3ffd3f..dbc7a488fc2d12bd875ac19dc638fe1b05f1938a 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
-@@ -193,6 +193,9 @@ class CORE_EXPORT File final : public Blob {
+@@ -192,6 +192,9 @@ class CORE_EXPORT File final : public Blob {
    }
    const String& name() const { return name_; }