chore: fix lint

fixup tests
chore: fixup linting
2026-02-26 03:01:17 -05:00 · 2020-11-10 14:07:04 -08:00 · 2020-11-10 14:03:02 -08:00 · 2020-11-10 14:03:00 -08:00 · 2020-11-10 14:02:22 -08:00 · 2020-11-10 14:02:22 -08:00
445 changed files with 3754 additions and 9958 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -158,6 +158,10 @@ env-mas-apple-silicon: &env-mas-apple-silicon
  TARGET_ARCH: arm64
  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1

+# Misc build configuration options.
+env-enable-sccache: &env-enable-sccache
+  USE_SCCACHE: true
+
 env-send-slack-notifications: &env-send-slack-notifications
  NOTIFY_SLACK: true
  
@@ -291,14 +295,26 @@ step-setup-env-for-build: &step-setup-env-for-build
      # To find `gn` executable.
      echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV

+      if [ "$USE_SCCACHE" == "true" ]; then
+        # https://github.com/mozilla/sccache
+        SCCACHE_PATH="$PWD/src/electron/external_binaries/sccache"
+        echo 'export SCCACHE_PATH="'"$SCCACHE_PATH"'"' >> $BASH_ENV
+        if [ "$CIRCLE_PR_NUMBER" != "" ]; then
+          #if building a fork set readonly access to sccache
+          echo 'export SCCACHE_BUCKET="electronjs-sccache-ci"' >> $BASH_ENV
+          echo 'export SCCACHE_TWO_TIER=true' >> $BASH_ENV
+        fi
+      fi
+
 step-setup-goma-for-build: &step-setup-goma-for-build
  run:
    name: Setup Goma
    command: |
-      echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
-      if [ "`uname`" == "Darwin" ]; then
-        echo 'ulimit -n 10000' >> $BASH_ENV
-        echo 'sudo launchctl limit maxfiles 65536 200000' >> $BASH_ENV
+      echo 'export USE_GOMA=true' >> $BASH_ENV
+      if [ "`uname`" == "Linux" ]; then
+        echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
+      else
+        echo 'export NUMBER_OF_NINJA_PROCESSES=25' >> $BASH_ENV
      fi
      if [ ! -z "$RAW_GOMA_AUTH" ]; then
        echo $RAW_GOMA_AUTH > ~/.goma_oauth2_config
@@ -307,7 +323,7 @@ step-setup-goma-for-build: &step-setup-goma-for-build
      cd build-tools
      npm install
      mkdir third_party
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+      node -e "require('./src/utils/goma.js').downloadAndPrepare()"
      node -e "require('./src/utils/goma.js').ensure()"
      echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
      echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
@@ -316,17 +332,15 @@ step-setup-goma-for-build: &step-setup-goma-for-build
 step-restore-brew-cache: &step-restore-brew-cache
  restore_cache:
    paths:
-      - /usr/local/Cellar/gnu-tar
-      - /usr/local/bin/gtar
+      - /usr/local/Homebrew
    keys:
-      - v4-brew-cache-{{ arch }}
+      - v2-brew-cache-{{ arch }}

 step-save-brew-cache: &step-save-brew-cache
  save_cache:
    paths:
-      - /usr/local/Cellar/gnu-tar
-      - /usr/local/bin/gtar
-    key: v4-brew-cache-{{ arch }}
+      - /usr/local/Homebrew
+    key: v2-brew-cache-{{ arch }}
    name: Persisting brew cache

 step-get-more-space-on-mac: &step-get-more-space-on-mac
@@ -447,6 +461,9 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
        # Fix Clang Install (wrong binary)
        rm -rf src/third_party/llvm-build
        python src/tools/clang/scripts/update.py
+        # Fix Framework Header Installs (symlinks not retained)
+        rm -rf src/electron/external_binaries
+        python src/electron/script/update-external-binaries.py
      fi

 step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
@@ -463,10 +480,8 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
    name: Install gnu-tar on macos
    command: |
      if [ "`uname`" == "Darwin" ]; then
-        if [ ! -d /usr/local/Cellar/gnu-tar/ ]; then
-          brew update
-          brew install gnu-tar
-        fi
+        brew update
+        brew install gnu-tar
        ln -fs /usr/local/bin/gtar /usr/local/bin/tar
      fi

@@ -475,7 +490,11 @@ step-gn-gen-default: &step-gn-gen-default
    name: Default GN gen
    command: |
      cd src
-      gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      else
+        gn gen out/Default --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      fi

 step-gn-check: &step-gn-check
  run:
@@ -484,6 +503,7 @@ step-gn-check: &step-gn-check
      cd src
      gn check out/Default //electron:electron_lib
      gn check out/Default //electron:electron_app
+      gn check out/Default //electron:manifests
      gn check out/Default //electron/shell/common/api:mojo
      # Check the hunspell filenames
      node electron/script/gen-hunspell-filenames.js --check
@@ -514,8 +534,12 @@ step-electron-build: &step-electron-build
        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
        rm -rf out/Default/clang_x64_v8_arm64/obj

-        # Regenerate because we just deleted some ninja files 
-        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        # Regenerate because we just deleted some ninja files
+        if [ "$USE_GOMA" == "true" ]; then
+          gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        else
+          gn gen out/Default --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        fi
      fi
      ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
      node electron/script/check-symlinks.js
@@ -591,7 +615,11 @@ step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-ge
    command: |
      cd src
      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-        gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        if [ "$USE_GOMA" == "true" ]; then
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        else
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        fi
      fi

 step-electron-chromedriver-build: &step-electron-chromedriver-build
@@ -702,7 +730,11 @@ step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
    name: ffmpeg GN gen
    command: |
      cd src
-      gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS"
+      else
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS"
+      fi

 step-ffmpeg-build: &step-ffmpeg-build
  run:
@@ -745,16 +777,21 @@ step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
        sh -e /etc/init.d/xvfb start
      fi

-step-show-goma-stats: &step-show-goma-stats
+step-show-sccache-stats: &step-show-sccache-stats
  run:
    shell: /bin/bash
-    name: Check goma stats after build
-    command: |      
-      set +e
-      set +o pipefail
-      $LOCAL_GOMA_DIR/goma_ctl.py stat
-      $LOCAL_GOMA_DIR/diagnose_goma_log.py
-      true
+    name: Check sccache/goma stats after build
+    command: |
+      if [ "$SCCACHE_PATH" != "" ]; then
+        $SCCACHE_PATH -s
+      fi
+      if [ "$USE_GOMA" == "true" ]; then
+        set +e
+        set +o pipefail
+        $LOCAL_GOMA_DIR/goma_ctl.py stat
+        $LOCAL_GOMA_DIR/diagnose_goma_log.py
+        true
+      fi
    when: always

 step-mksnapshot-build: &step-mksnapshot-build
@@ -893,8 +930,6 @@ step-ninja-summary: &step-ninja-summary
  run:
    name: Print ninja summary
    command: |
-      set +e
-      set +o pipefail
      python depot_tools/post_build_ninja_summary.py -C src/out/Default

 step-ninja-report: &step-ninja-report
@@ -1163,7 +1198,6 @@ steps-electron-gn-check: &steps-electron-gn-check
    - *step-maybe-early-exit-doc-only-change
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
    - *step-gn-gen-default
    - *step-gn-check

@@ -1197,7 +1231,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha

    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
+    - *step-restore-brew-cache
    - *step-get-more-space-on-mac
    - *step-install-npm-deps-on-mac
    - *step-fix-sync-on-mac
@@ -1206,13 +1240,26 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    #Compile ts/js to verify doc change didn't break anything
    - *step-ts-compile

+steps-chromedriver-build: &steps-chromedriver-build
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-fix-sync-on-mac
+
+    - *step-electron-maybe-chromedriver-gn-gen
+    - *step-electron-chromedriver-build
+    - *step-electron-chromedriver-store
+
+    - *step-maybe-notify-slack-failure
+
 steps-native-tests: &steps-native-tests
  steps:
    - attach_workspace:
        at: .
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
    - *step-gn-gen-default

    - run:
@@ -1220,7 +1267,7 @@ steps-native-tests: &steps-native-tests
        command: |
          cd src
          ninja -C out/Default $BUILD_TARGET
-    - *step-show-goma-stats
+    - *step-show-sccache-stats

    - *step-setup-linux-for-headless-testing
    - run:
@@ -1525,7 +1572,7 @@ commands:
            - *step-nodejs-headers-build
            - *step-nodejs-headers-store

-            - *step-show-goma-stats
+            - *step-show-sccache-stats

            # mksnapshot
            - *step-mksnapshot-build
@@ -1613,14 +1660,13 @@ commands:
            - *step-gclient-sync
            - *step-delete-git-directories
            - *step-minimize-workspace-size-from-checkout
-      - *step-fix-sync-on-mac
+      - *step-fix-sync-on-mac            
      - *step-setup-env-for-build
-      - *step-setup-goma-for-build
      - *step-gn-gen-default

      # Electron app
      - *step-electron-build
-      - *step-show-goma-stats
+      - *step-show-sccache-stats
      - *step-maybe-generate-breakpad-symbols
      - *step-maybe-electron-dist-strip
      - *step-electron-dist-build
@@ -1804,6 +1850,14 @@ jobs:
      <<: *env-testing-build
    <<: *steps-electron-gn-check

+  linux-x64-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-x64-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1823,8 +1877,8 @@ jobs:
      <<: *env-linux-2xlarge-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1835,8 +1889,8 @@ jobs:
    environment:
      <<: *env-linux-2xlarge-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1856,6 +1910,15 @@ jobs:
          checkout: true
          use-out-cache: false

+  linux-ia32-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-ia32-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1877,9 +1940,9 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-ia32
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1891,9 +1954,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-ia32
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1914,6 +1977,15 @@ jobs:
          checkout: true
          use-out-cache: false

+  linux-arm-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-arm-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1934,10 +2006,10 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1949,9 +2021,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1980,6 +2052,15 @@ jobs:
      <<: *env-testing-build
    <<: *steps-electron-gn-check

+  linux-arm64-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-arm64-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -2000,9 +2081,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2014,8 +2095,8 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2062,9 +2143,9 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2075,10 +2156,10 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-apple-silicon
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2089,8 +2170,8 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2101,9 +2182,9 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-apple-silicon
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2170,9 +2251,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2184,9 +2265,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2198,6 +2279,7 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
      - electron-publish:
@@ -2210,8 +2292,8 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -265,6 +265,21 @@ if (is_linux) {
  }
 }

+source_set("manifests") {
+  sources = [
+    "//electron/shell/app/manifests.cc",
+    "//electron/shell/app/manifests.h",
+  ]
+
+  include_dirs = [ "//electron" ]
+
+  deps = [
+    "//electron/shell/common/api:mojo",
+    "//printing/buildflags",
+    "//services/service_manager/public/cpp",
+  ]
+}
+
 npm_action("electron_version_args") {
  script = "generate-version-json"

@@ -313,6 +328,7 @@ source_set("electron_lib") {
    ":electron_fuses",
    ":electron_js2c",
    ":electron_version_header",
+    ":manifests",
    ":resources",
    "buildflags",
    "chromium_src:chrome",
@@ -337,6 +353,7 @@ source_set("electron_lib") {
    "//components/viz/service",
    "//content/public/browser",
    "//content/public/child",
+    "//content/public/common:service_names",
    "//content/public/gpu",
    "//content/public/renderer",
    "//content/public/utility",
@@ -491,7 +508,6 @@ source_set("electron_lib") {
    }
  }
  if (is_linux) {
-    libs = [ "xshmfence" ]
    deps += [
      ":libnotify_loader",
      "//build/config/linux/gtk",
@@ -648,7 +664,6 @@ source_set("electron_lib") {
  }
  if (enable_pdf_viewer) {
    deps += [
-      "//chrome/browser/resources/pdf:pdf_resources",
      "//components/pdf/browser",
      "//components/pdf/renderer",
      "//pdf:pdf_ppapi",
@@ -992,9 +1007,6 @@ if (is_mac) {
    deps = [
      ":electron_app_framework_bundle_data",
      ":electron_app_resources",
-      ":electron_fuses",
-      "//base",
-      "//electron/buildflags",
    ]
    if (is_mas_build) {
      deps += [ ":electron_login_helper_app" ]
@@ -1158,19 +1170,6 @@ if (is_mac) {
        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
-        # those in the Windows thread pool, and others) whose stack size we can
-        # only control through this setting. Because Chrome's main thread needs
-        # a minimum 1.5 MiB stack, the main thread (in 32-bit builds only) uses
-        # fibers to switch to a 1.5 MiB stack before running any other code.
-        ldflags += [ "/STACK:0x80000" ]
-      } else {
-        # Increase the initial stack size. The default is 1MB, this is 8MB.
-        ldflags += [ "/STACK:0x800000" ]
-      }
-
      # This is to support renaming of electron.exe. node-gyp has hard-coded
      # executable names which it will recognise as node. This module definition
      # file claims that the electron executable is in fact named "node.exe",
--- a/6
+++ b/6
@@ -14,13 +14,13 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '89.0.4389.23',
+    '2a55c4f55b99b2191ea59cba1e2f6da4dbb7dee0',
  'node_version':
-    'v14.15.1',
+    'v14.15.0',
  'nan_version':
    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
  'squirrel.mac_version':
-    'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f',
+    'a3a5b3f03b824441c014893b18f99a103b2603e9',

  'pyyaml_version': '3.12',
  'requests_version': 'e4d59bedfd3c7f4f254f4f5d036587bcd8152458',
--- a/2
+++ b/2
@@ -1 +1 @@
-12.0.0-beta.27
+12.0.0-nightly.20201110
--- a/README.md
+++ b/README.md
@@ -29,13 +29,16 @@ The preferred method is to install Electron as a development dependency in your
 app:

 ```sh
-npm install electron --save-dev
+npm install electron --save-dev [--save-exact]
 ```

-For more installation options and troubleshooting tips, see
-[installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
+The `--save-exact` flag is recommended for Electron prior to version 2, as it does not follow semantic
+versioning. As of version 2.0.0, Electron follows semver, so you don't need `--save-exact` flag. For info on how to manage Electron versions in your apps, see
 [Electron versioning](docs/tutorial/electron-versioning.md).

+For more installation options and troubleshooting tips, see
+[installation](docs/tutorial/installation.md).
+
 ## Quick start & Electron Fiddle

 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -141,8 +141,7 @@ build_script:
  - cd build-tools
  - npm install
  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - node -e "require('./src/utils/goma.js').downloadAndPrepare()"
  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
  - cd ..
@@ -152,6 +151,7 @@ build_script:
  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
  - gn check out/Default //electron:electron_lib
  - gn check out/Default //electron:electron_app
+  - gn check out/Default //electron:manifests
  - gn check out/Default //electron/shell/common/api:mojo
  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -93,6 +93,6 @@ steps:
  condition: always()

 - powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force
+    Remove-Item -path $env:APPDATA/Electron* -Recurse
  displayName: 'Delete user app data directories'
  condition: always()
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -143,17 +143,10 @@ static_library("chrome") {
      "//chrome/browser/platform_util.h",
      "//chrome/browser/ui/browser_dialogs.h",
      "//chrome/browser/ui/color_chooser.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
    ]

    if (use_aura) {
-      sources += [
-        "//chrome/browser/platform_util_aura.cc",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
-      ]
+      sources += [ "//chrome/browser/platform_util_aura.cc" ]

      if (!is_win) {
        sources += [
@@ -170,8 +163,6 @@ static_library("chrome") {
        "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
        "//chrome/browser/ui/cocoa/color_chooser_mac.h",
        "//chrome/browser/ui/cocoa/color_chooser_mac.mm",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
      ]
      deps += [
        "//components/remote_cocoa/app_shim",
@@ -217,6 +208,8 @@ static_library("chrome") {
      "//chrome/browser/printing/print_view_manager_basic.h",
      "//chrome/browser/printing/printer_query.cc",
      "//chrome/browser/printing/printer_query.h",
+      "//chrome/browser/printing/printing_message_filter.cc",
+      "//chrome/browser/printing/printing_message_filter.h",
      "//chrome/browser/printing/printing_service.cc",
      "//chrome/browser/printing/printing_service.h",
    ]
@@ -293,15 +286,13 @@ static_library("chrome") {
    }
  }

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

--- a/docs/README.md
+++ b/docs/README.md
@@ -18,20 +18,27 @@ an issue:

 ## Guides and Tutorials

-### Quickstart
-
-* [Quick Start Guide](tutorial/quick-start.md)
+* [Setting up the Development Environment](tutorial/development-environment.md)
+  * [Setting up macOS](tutorial/development-environment.md#setting-up-macos)
+  * [Setting up Windows](tutorial/development-environment.md#setting-up-windows)
+  * [Setting up Linux](tutorial/development-environment.md#setting-up-linux)
+  * [Choosing an Editor](tutorial/development-environment.md#a-good-editor)
+* [Creating your First App](tutorial/quick-start.md)
  * [Prerequisites](tutorial/quick-start.md#prerequisites)
  * [Create a basic application](tutorial/quick-start.md#create-a-basic-application)
-  * [Run your application](tutorial/quick-start.md#run-your-application)
  * [Package and distribute the application](tutorial/quick-start.md#package-and-distribute-the-application)
-
-### Learning the basics
-
-* [Electron's Process Model](tutorial/quick-start.md#application-architecture)
+* [Boilerplates and CLIs](tutorial/boilerplates-and-clis.md)
+  * [Boilerplate vs CLI](tutorial/boilerplates-and-clis.md#boilerplate-vs-cli)
+  * [electron-forge](tutorial/boilerplates-and-clis.md#electron-forge)
+  * [electron-builder](tutorial/boilerplates-and-clis.md#electron-builder)
+  * [electron-react-boilerplate](tutorial/boilerplates-and-clis.md#electron-react-boilerplate)
+  * [Other Tools and Boilerplates](tutorial/boilerplates-and-clis.md#other-tools-and-boilerplates)
+* [Application Architecture](tutorial/quick-start.md#application-architecture)
  * [Main and Renderer Processes](tutorial/quick-start.md#main-and-renderer-processes)
  * [Electron API](tutorial/quick-start.md#electron-api)
  * [Node.js API](tutorial/quick-start.md#nodejs-api)
+  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
+  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
  * [Notifications](tutorial/notifications.md)
  * [Recent Documents](tutorial/recent-documents.md)
@@ -46,20 +53,9 @@ an issue:
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
  * [Dark Mode](tutorial/dark-mode.md)
  * [Web embeds in Electron](tutorial/web-embeds.md)
-* [Boilerplates and CLIs](tutorial/boilerplates-and-clis.md)
-  * [Boilerplate vs CLI](tutorial/boilerplates-and-clis.md#boilerplate-vs-cli)
-  * [electron-forge](tutorial/boilerplates-and-clis.md#electron-forge)
-  * [electron-builder](tutorial/boilerplates-and-clis.md#electron-builder)
-  * [electron-react-boilerplate](tutorial/boilerplates-and-clis.md#electron-react-boilerplate)
-  * [Other Tools and Boilerplates](tutorial/boilerplates-and-clis.md#other-tools-and-boilerplates)
-
-### Advanced steps
-
-* Application Architecture
-  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
-  * [Performance Strategies](tutorial/performance.md)
-  * [Security Strategies](tutorial/security.md)
 * [Accessibility](tutorial/accessibility.md)
+  * [Spectron](tutorial/accessibility.md#spectron)
+  * [Devtron](tutorial/accessibility.md#devtron)
  * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
 * [Testing and Debugging](tutorial/application-debugging.md)
  * [Debugging the Main Process](tutorial/debugging-main-process.md)
@@ -74,6 +70,11 @@ an issue:
  * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
  * [Windows Store](tutorial/windows-store-guide.md)
  * [Snapcraft](tutorial/snapcraft.md)
+* [Security](tutorial/security.md)
+  * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
+  * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
+  * [Electron Security Warnings](tutorial/security.md#electron-security-warnings)
+  * [Security Checklist](tutorial/security.md#checklist-security-recommendations)
 * [Updates](tutorial/updates.md)
  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
@@ -148,7 +149,6 @@ These individual tutorials expand on topics discussed in the guide above.

 ### Modules for the Renderer Process (Web Page):

-* [contextBridge](api/context-bridge.md)
 * [desktopCapturer](api/desktop-capturer.md)
 * [ipcRenderer](api/ipc-renderer.md)
 * [remote](api/remote.md)
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -406,9 +406,6 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Integer - The exit code of the process, unless `reason` is
-    `launch-failed`, in which case `exitCode` will be a platform-specific
-    launch failure error code.

 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -1177,9 +1174,9 @@ For `infoType` equal to `basic`:

 Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.

-### `app.setBadgeCount([count])` _Linux_ _macOS_
+### `app.setBadgeCount(count)` _Linux_ _macOS_

-* `count` Integer (optional) - If a value is provided, set the badge to the provided value otherwise, on macOS, display a plain white dot (e.g. unknown number of notifications). On Linux, if a value is not provided the badge will not display.
+* `count` Integer

 Returns `Boolean` - Whether the call succeeded.

@@ -1492,12 +1489,3 @@ which native modules you can use in the renderer process.  For more information
 on the direction Electron is going with renderer process restarts and usage of
 native modules in the renderer process please check out this
 [Tracking Issue](https://github.com/electron/electron/issues/18397).
-
-### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
-
-A `Boolean` which when `true` indicates that the app is currently running
-under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).
-
-You can use this property to prompt users to download the arm64 version of
-your application when they are running the x64 version under Rosetta
-incorrectly.
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -337,17 +337,18 @@ 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 `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
-      be available in the `preload` script and not the loaded page. This option
-      should be used when loading potentially untrusted remote content to ensure
-      the loaded content cannot tamper with the `preload` script and any
-      Electron APIs being used.  This option uses the same technique used by
-      [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.
+      to `false`. The context that the `preload` script runs in will still
+      have full access to the `document` and `window` globals but it will use
+      its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.)
+      and will be isolated from any changes made to the global environment
+      by the loaded page. The Electron API will only be available in the
+      `preload` script and not the loaded page. This option should be used when
+      loading potentially untrusted remote content to ensure the loaded content
+      cannot tamper with the `preload` script and any Electron APIs being used.
+      This option uses the same technique used by [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_
@@ -543,12 +544,6 @@ Note that this is only emitted when the window is being resized manually. Resizi

 Emitted after the window has been resized.

-#### Event: 'resized' _macOS_ _Windows_
-
-Emitted once when the window has finished being resized.
-
-This is usually emitted when the window has been resized manually. On macOS, resizing the window with `setBounds`/`setSize` and setting the `animate` parameter to `true` will also emit this event once resizing has finished.
-
 #### Event: 'will-move' _macOS_ _Windows_

 Returns:
@@ -564,12 +559,12 @@ Note that this is only emitted when the window is being resized manually. Resizi

 Emitted when the window is being moved to a new position.

-#### Event: 'moved' _macOS_ _Windows_
+__Note__: On macOS this event is an alias of `moved`.
+
+#### Event: 'moved' _macOS_

 Emitted once when the window is moved to a new position.

-__Note__: On macOS this event is an alias of `move`.
-
 #### Event: 'enter-full-screen'

 Emitted when the window enters a full-screen state.
@@ -735,7 +730,7 @@ The method will also not return if the extension's manifest is missing or incomp
 is emitted.

 **Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
+[`ses.loadExtension(path)`](session.md#sesloadextensionpath).

 #### `BrowserWindow.removeExtension(name)` _Deprecated_

@@ -777,7 +772,7 @@ The method will also not return if the extension's manifest is missing or incomp
 is emitted.

 **Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
+[`ses.loadExtension(path)`](session.md#sesloadextensionpath).

 #### `BrowserWindow.removeDevToolsExtension(name)` _Deprecated_

@@ -1051,7 +1046,7 @@ Returns `Boolean` - Whether the window is in simple (pre-Lion) fullscreen mode.

 Returns `Boolean` - Whether the window is in normal state (not maximized, not minimized, not in fullscreen mode).

-#### `win.setAspectRatio(aspectRatio[, extraSize])`
+#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_ _Linux_

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
@@ -1072,9 +1067,6 @@ the player itself we would call this function with arguments of 16/9 and
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.

-The aspect ratio is not respected when window is resized programmingly with
-APIs like `win.setSize`.
-
 #### `win.setBackgroundColor(backgroundColor)`

 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1867,13 +1859,6 @@ Replacement API for setBrowserView supporting work with multi browser views.

 * `browserView` [BrowserView](browser-view.md)

-#### `win.setTopBrowserView(browserView)` _Experimental_
-
-* `browserView` [BrowserView](browser-view.md)
-
-Raises `browserView` above other `BrowserView`s attached to `win`.
-Throws an error if `browserView` is not attached to `win`.
-
 #### `win.getBrowserViews()` _Experimental_

 Returns `BrowserView[]` - an array of all BrowserViews that have been attached
--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -47,7 +47,6 @@ following properties:
    be aborted. When mode is `manual` the redirection will be cancelled unless
    [`request.followRedirect`](#requestfollowredirect) is invoked synchronously
    during the [`redirect`](#event-redirect) event.  Defaults to `follow`.
-  * `origin` String (optional) - The origin URL of the request.

 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -16,7 +16,7 @@ const { app, contentTracing } = require('electron')
 app.whenReady().then(() => {
  (async () => {
    await contentTracing.startRecording({
-      included_categories: ['*']
+      include_categories: ['*']
    })
    console.log('Tracing started')
    await new Promise(resolve => setTimeout(resolve, 5000))
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -44,19 +44,19 @@ The `contextBridge` module has the following methods:
 ### `contextBridge.exposeInMainWorld(apiKey, api)` _Experimental_

 * `apiKey` String - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
-* `api` any - Your API, more information on what this API can be and how it works is available below.
+* `api` Record<String, any> - Your API object, more information on what this API can be and how it works is available below.

 ## Usage

-### API
+### API Objects

-The `api` provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be a `Function`, `String`, `Number`, `Array`, `Boolean`, or an object
+The `api` object provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be an object
 whose keys are strings and values are a `Function`, `String`, `Number`, `Array`, `Boolean`, or another nested object that meets the same conditions.

 `Function` values are proxied to the other context and all other values are **copied** and **frozen**. Any data / primitives sent in
-the API become immutable and updates on either side of the bridge do not result in an update on the other side.
+the API object become immutable and updates on either side of the bridge do not result in an update on the other side.

-An example of a complex API is shown below:
+An example of a complex API object is shown below:

 ```javascript
 const { contextBridge } = require('electron')
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -128,7 +128,7 @@ must be at most 39 bytes long, and values must be no longer than 127 bytes.
 Keys with names longer than the maximum will be silently ignored. Key values
 longer than the maximum length will be truncated.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getLastCrashReport()`

@@ -137,7 +137,7 @@ last crash report. Only crash reports that have been uploaded will be returned;
 even if a crash report is present on disk it will not be returned until it is
 uploaded. In the case that there are no uploaded reports, `null` is returned.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getUploadedReports()`

@@ -146,14 +146,14 @@ Returns [`CrashReport[]`](structures/crash-report.md):
 Returns all uploaded crash reports. Each report contains the date and uploaded
 ID.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getUploadToServer()`

 Returns `Boolean` - Whether reports should be submitted to the server. Set through
 the `start` method or `setUploadToServer`.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.setUploadToServer(uploadToServer)`

@@ -162,7 +162,13 @@ the `start` method or `setUploadToServer`.
 This would normally be controlled by user preferences. This has no effect if
 called before `start` is called.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.
+
+### `crashReporter.getCrashesDirectory()` _Deprecated_
+
+Returns `String` - The directory where crashes are temporarily stored before being uploaded.
+
+**Note:** This method is deprecated, use `app.getPath('crashDumps')` instead.

 ### `crashReporter.addExtraParameter(key, value)`

--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -15,7 +15,7 @@ extension capabilities.

 Electron only supports loading unpacked extensions (i.e., `.crx` files do not
 work). Extensions are installed per-`session`. To load an extension, call
-[`ses.loadExtension`](session.md#sesloadextensionpath-options):
+[`ses.loadExtension`](session.md#sesloadextensionpath):

 ```js
 const { session } = require('electron')
@@ -115,9 +115,3 @@ The following methods of `chrome.management` are supported:
 - `chrome.management.getPermissionWarningsByManifest`
 - `chrome.management.onEnabled`
 - `chrome.management.onDisabled`
-
-### `chrome.webRequest`
-
-All features of this API are supported.
-
-> **NOTE:** Electron's [`webRequest`](web-request.md) module takes precedence over `chrome.webRequest` if there are conflicting handlers.
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -9,7 +9,7 @@ with the operating system so that you can customize the operations for various
 shortcuts.

 **Note:** The shortcut is global; it will work even if the app does
-not have the keyboard focus. This module cannot be used before the `ready`
+not have the keyboard focus. You should not use this module until the `ready`
 event of the app module is emitted.

 ```javascript
--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -61,13 +61,9 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
@@ -89,13 +85,9 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
@@ -132,13 +124,9 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -88,7 +88,6 @@ The `role` property can have following values:
 * `resetZoom` - Reset the focused page's zoom level to the original size.
 * `zoomIn` - Zoom in the focused page by 10%.
 * `zoomOut` - Zoom out the focused page by 10%.
-* `toggleSpellChecker` - Enable/disable builtin spell checker.
 * `fileMenu` - Whole default "File" menu (Close / Quit)
 * `editMenu` - Whole default "Edit" menu (Undo, Copy, etc.).
 * `viewMenu` - Whole default "View" menu (Reload, Toggle Developer Tools, etc.)
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -65,18 +65,3 @@ before considered idle.  `locked` is available on supported systems only.
 Returns `Integer` - Idle time in seconds

 Calculate system idle time in seconds.
-
-### `powerMonitor.isOnBatteryPower()`
-
-Returns `Boolean` - Whether the system is on battery power.
-
-To monitor for changes in this property, use the `on-battery` and `on-ac`
-events.
-
-## Properties
-
-### `powerMonitor.onBatteryPower`
-
-A `Boolean` property. True if the system is on battery power.
-
-See [`powerMonitor.isOnBatteryPower()`](#powermonitorisonbatterypower).
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -483,8 +483,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 })
 ```

-> **NOTE:** The result of this procedure is cached by the network service.
-
 #### `ses.setPermissionRequestHandler(handler)`

 * `handler` Function | null
@@ -492,7 +490,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
  * `permission` String - The type of requested permission.
    * `clipboard-read` - Request access to read from the clipboard.
    * `media` -  Request access to media devices such as camera, microphone and speakers.
-    * `display-capture` - Request access to capture the screen.
    * `mediaKeySystem` - Request access to DRM protected content.
    * `geolocation` - Request access to user's current location.
    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
@@ -676,16 +673,6 @@ this session just before normal `preload` scripts run.
 Returns `String[]` an array of paths to preload scripts that have been
 registered.

-#### `ses.setSpellCheckerEnabled(enable)`
-
-* `enable` Boolean
-
-Sets whether to enable the builtin spell checker.
-
-#### `ses.isSpellCheckerEnabled()`
-
-Returns `Boolean` - Whether the builtin spell checker is enabled.
-
 #### `ses.setSpellCheckerLanguages(languages)`

 * `languages` String[] - An array of language codes to enable the spellchecker for.
@@ -743,13 +730,9 @@ will not work on non-persistent (in-memory) sessions.

 **Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well

-#### `ses.loadExtension(path[, options])`
+#### `ses.loadExtension(path)`

 * `path` String - Path to a directory containing an unpacked Chrome extension
-* `options` Object (optional)
-  * `allowFileAccess` Boolean - Whether to allow the extension to read local files over `file://`
-    protocol and inject content scripts into `file://` pages. This is required e.g. for loading
-    devtools extensions on `file://` URLs. Defaults to false.

 Returns `Promise<Extension>` - resolves when the extension is loaded.

@@ -772,11 +755,7 @@ const { app, session } = require('electron')
 const path = require('path')

 app.on('ready', async () => {
-  await session.defaultSession.loadExtension(
-    path.join(__dirname, 'react-devtools'),
-    // allowFileAccess is required to load the devtools extension on file:// URLs.
-    { allowFileAccess: true }
-  )
+  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
  // Note that in order to use the React DevTools extension, you'll need to
  // download and unzip a copy of the extension.
 })
@@ -824,10 +803,6 @@ The following properties are available on instances of `Session`:
 A `String[]` array which consists of all the known available spell checker languages.  Providing a language
 code to the `setSpellCheckerLanguages` API that isn't in this array will result in an error.

-#### `ses.spellCheckerEnabled`
-
-A `Boolean` indicating whether builtin spell checker is enabled.
-
 #### `ses.cookies` _Readonly_

 A [`Cookies`](cookies.md) object for this session.
--- a/docs/api/structures/cancellable-navigation-event.md
+++ b/docs/api/structures/cancellable-navigation-event.md
@@ -0,0 +1,6 @@
+# CancellableNavigationEvent Object extends `Event`
+
+* `returnValue` Object - Set this to cancel the navigation event and optionally return a custom error code or error page
+  * `errorCode` Number - Can be any error code from the [Net Error List](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).  If you provide `errorPage` then this code can not be `-3`. We recommend using `-2` which is `net::Aborted`.
+  * `errorPage` String (optional) - Custom HTML error page to display when the navigation is cancelled.
+
--- a/docs/api/structures/display.md
+++ b/docs/api/structures/display.md
@@ -10,7 +10,6 @@
 * `colorSpace` String -  represent a color space (three-dimensional object which contains all realizable color combinations) for the purpose of color conversions
 * `colorDepth` Number - The number of bits per pixel.
 * `depthPerComponent` Number - The number of bits per color component.
-* `displayFrequency` Number - The display refresh rate.
 * `bounds` [Rectangle](rectangle.md)
 * `size` [Size](size.md)
 * `workArea` [Rectangle](rectangle.md)
--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -1,10 +1,8 @@
 # IpcMainEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `senderFrame` WebFrameMain _Readonly_ - The frame that sent this message
 * `ports` MessagePortMain[] - A list of MessagePorts that were transferred with this message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
  * `channel` String
--- a/docs/api/structures/ipc-main-invoke-event.md
+++ b/docs/api/structures/ipc-main-invoke-event.md
@@ -1,6 +1,4 @@
 # IpcMainInvokeEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `senderFrame` WebFrameMain _Readonly_ - The frame that sent this message
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -42,8 +42,7 @@ returns `null`.

 * `id` Integer

-Returns `WebContents` | undefined - A WebContents instance with the given ID, or
-`undefined` if there is no WebContents associated with the given ID.
+Returns `WebContents` - A WebContents instance with the given ID.

 ## Class: WebContents

@@ -58,6 +57,25 @@ Process: [Main](../glossary.md#main-process)
 Emitted when the navigation is done, i.e. the spinner of the tab has stopped
 spinning, and the `onload` event was dispatched.

+#### Event: 'will-fail-load' _Experimental_
+
+Returns:
+
+* `event` [CancellableNavigationEvent](structures/cancellable-navigation-event.md)
+* `url` String
+* `isInPlace` Boolean
+* `isMainFrame` Boolean
+* `frameProcessId` Integer
+* `frameRoutingId` Integer
+* `errorCode` Integer
+* `errorDescription` String
+
+This event will be emitted after `did-start-loading` and always before the
+`did-fail-load` event for the same navigation.
+
+Settings `event.returnValue` to the appropriate object will result in a custom error page being
+displayed using custom HTML.
+
 #### Event: 'did-fail-load'

 Returns:
@@ -156,7 +174,7 @@ Returns:
  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`.

-Deprecated in favor of [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+Deprecated in favor of [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).

 Emitted when the page requests to open a new window for a `url`. It could be
 requested by `window.open` or an external link like `<a target='_blank'>`.
@@ -204,7 +222,7 @@ Returns:
      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).
+      [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).
      Unrecognized options are not filtered out.
    * `additionalFeatures` String[] - The non-standard features (features not
      handled Chromium or Electron) _Deprecated_
@@ -221,15 +239,15 @@ Returns:

 Emitted _after_ successful creation of a window via `window.open` in the renderer.
 Not emitted if the creation of the window is canceled from
-[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).

 See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `webContents.setWindowOpenHandler`.

-#### Event: 'will-navigate'
+#### Event: 'will-navigate' _Experimental_

 Returns:

-* `event` Event
+* `event` [CancellableNavigationEvent](structures/cancellable-navigation-event.md)
 * `url` String

 Emitted when a user or the page wants to start navigation. It can happen when
@@ -244,6 +262,9 @@ this purpose.

 Calling `event.preventDefault()` will prevent the navigation.

+Settings `event.returnValue` to the appropriate object will result in a custom error page being
+displayed using custom HTML and the navigation being cancelled.
+
 #### Event: 'did-start-navigation'

 Returns:
@@ -402,9 +423,6 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Integer - The exit code of the process, unless `reason` is
-    `launch-failed`, in which case `exitCode` will be a platform-specific
-    launch failure error code.

 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -1661,7 +1679,8 @@ included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

 > **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1697,9 +1716,7 @@ app.whenReady().then(() => {

 #### `contents.sendToFrame(frameId, channel, ...args)`

-* `frameId` Integer | [number, number] - the ID of the frame to send to, or a
-  pair of `[processId, frameId]` if the frame is in a different process to the
-  main frame.
+* `frameId` Integer
 * `channel` String
 * `...args` any[]

@@ -1709,8 +1726,9 @@ Send an asynchronous message to a specific frame in a renderer process via
 chains will not be included. Sending Functions, Promises, Symbols, WeakMaps, or
 WeakSets will throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1873,7 +1891,7 @@ Returns `Boolean` - If *offscreen rendering* is enabled returns whether it is cu
 * `fps` Integer

 If *offscreen rendering* is enabled sets the frame rate to the specified number.
-Only values between 1 and 240 are accepted.
+Only values between 1 and 60 are accepted.

 #### `contents.getFrameRate()`

@@ -1971,7 +1989,7 @@ The zoom factor is the zoom percent divided by 100, so 300% = 3.0.
 #### `contents.frameRate`

 An `Integer` property that sets the frame rate of the web contents to the specified number.
-Only values between 1 and 240 are accepted.
+Only values between 1 and 60 are accepted.

 Only applicable if *offscreen rendering* is enabled.

--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -26,7 +26,7 @@ win.webContents.on(
 )
 ```

-You can also access frames of existing pages by using the `mainFrame` property
+You can also access frames of existing pages by using the `webFrame` property
 of [`WebContents`](web-contents.md).

 ```javascript
@@ -57,14 +57,13 @@ These methods can be accessed from the `webFrameMain` module:

 ### `webFrameMain.fromId(processId, routingId)`

-* `processId` Integer - An `Integer` representing the internal ID of the process which owns the frame.
-* `routingId` Integer - An `Integer` representing the unique frame ID in the
+* `processId` Integer - An `Integer` representing the id of the process which owns the frame.
+* `routingId` Integer - An `Integer` representing the unique frame id in the
  current renderer process. Routing IDs can be retrieved from `WebFrameMain`
  instances (`frame.routingId`) and are also passed by frame
  specific `WebContents` navigation events (e.g. `did-frame-navigate`).

-Returns `WebFrameMain | undefined` - A frame with the given process and routing IDs,
-or `undefined` if there is no WebFrameMain associated with the given IDs.
+Returns `WebFrameMain` - A frame with the given process and routing IDs.

 ## Class: WebFrameMain

@@ -86,62 +85,10 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.

-#### `frame.executeJavaScriptInIsolatedWorld(worldId, code[, userGesture])`
-
-* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature.  You can provide any integer here.
-* `code` String
-* `userGesture` Boolean (optional) - Default is `false`.
-
-Returns `Promise<unknown>` - A promise that resolves with the result of the executed
-code or is rejected if execution throws or results in a rejected promise.
-
-Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
-
 #### `frame.reload()`

 Returns `boolean` - Whether the reload was initiated successfully. Only results in `false` when the frame has no history.

-#### `frame.send(channel, ...args)`
-
-* `channel` String
-* `...args` any[]
-
-Send an asynchronous message to the renderer process via `channel`, along with
-arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
-included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
-throw an exception.
-
-The renderer process can handle the message by listening to `channel` with the
-[`ipcRenderer`](ipc-renderer.md) module.
-
-#### `frame.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Send a message to the renderer process, optionally transferring ownership of
-zero or more [`MessagePortMain`][] objects.
-
-The transferred `MessagePortMain` objects will be available in the renderer
-process by accessing the `ports` property of the emitted event. When they
-arrive in the renderer, they will be native DOM `MessagePort` objects.
-
-For example:
-
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-webContents.mainFrame.postMessage('port', { message: 'hello' }, [port1])
-
-// Renderer process
-ipcRenderer.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
 ### Instance Properties

 #### `frame.url` _Readonly_
--- a/docs/api/web-request.md
+++ b/docs/api/web-request.md
@@ -51,8 +51,6 @@ The following methods are available on instances of `WebRequest`:
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -96,8 +94,6 @@ Some examples of valid `urls`:
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -125,8 +121,6 @@ The `callback` has to be called with a `response` object.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -147,8 +141,6 @@ response are visible by the time this listener is fired.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -181,8 +173,6 @@ The `callback` has to be called with a `response` object.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -207,8 +197,6 @@ and response headers are available.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -234,8 +222,6 @@ redirect is about to occur.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -259,8 +245,6 @@ completed.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -966,4 +966,4 @@ Emitted when DevTools is closed.
 Emitted when DevTools is focused / opened.

 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
-[chrome-webview]: https://developer.chrome.com/docs/extensions/reference/webviewTag/
+[chrome-webview]: https://developer.chrome.com/apps/tags/webview
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -26,7 +26,7 @@ BrowserWindow constructor options are set by, in increasing precedence
 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).
+[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).
 Note that `webContents.setWindowOpenHandler` has final say and full privilege
 because it is invoked in the main process.

--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -12,16 +12,6 @@ This document uses the following convention to categorize breaking changes:
 - **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 - **Removed:** An API or feature was removed, and is no longer supported by Electron.

-## Planned Breaking API Changes (14.0)
-
-### Removed: `worldSafeExecuteJavaScript`
-
-In Electron 14, `worldSafeExecuteJavaScript` will be removed.  There is no alternative, please
-ensure your code works with this property enabled.  It has been enabled by default since Electron
-12.
-
-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.
-
 ## Planned Breaking API Changes (13.0)

 ### Removed: `shell.moveItemToTrash()`
@@ -44,15 +34,6 @@ Chromium has removed support for Flash, and so we must follow suit. See
 Chromium's [Flash Roadmap](https://www.chromium.org/flash-roadmap) for more
 details.

-### Default Changed: `worldSafeExecuteJavaScript` defaults to `true`
-
-In Electron 12, `worldSafeExecuteJavaScript` will be enabled by default.  To restore
-the previous behavior, `worldSafeExecuteJavaScript: false` must be specified in WebPreferences.
-Please note that setting this option to `false` is **insecure**.
-
-This option will be removed in Electron 14 so please migrate your code to support the default
-value.
-
 ### Default Changed: `contextIsolation` defaults to `true`

 In Electron 12, `contextIsolation` will be enabled by default.  To restore
@@ -62,18 +43,6 @@ We [recommend having contextIsolation enabled](https://github.com/electron/elect

 For more details see: https://github.com/electron/electron/issues/23506

-### Removed: `crashReporter.getCrashesDirectory()`
-
-The `crashReporter.getCrashesDirectory` method has been removed. Usage
-should be replaced by `app.getPath('crashDumps')`.
-
-```js
-// Removed in Electron 12
-crashReporter.getCrashesDirectory()
-// Replace with
-app.getPath('crashDumps')
-```
-
 ### Removed: `crashReporter` methods in the renderer process

 The following `crashReporter` methods are no longer available in the renderer
@@ -134,12 +103,7 @@ shell.trashItem(path).then(/* ... */)

 ## Planned Breaking API Changes (11.0)

-### Removed: `BrowserView.{destroy, fromId, fromWebContents, getAllViews}` and `id` property of `BrowserView`
-The experimental APIs `BrowserView.{destroy, fromId, fromWebContents, getAllViews}`
-have now been removed. Additionally, the `id` property of `BrowserView`
-has also been removed.
-
-For more detailed information, see [#23578](https://github.com/electron/electron/pull/23578).
+There are no breaking changes planned for 11.0.

 ## Planned Breaking API Changes (10.0)

@@ -282,45 +246,6 @@ you should plan to update your native modules to be context aware.

 For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).

-### Deprecated: `BrowserWindow` extension APIs
-
-The following extension APIs have been deprecated:
-* `BrowserWindow.addExtension(path)`
-* `BrowserWindow.addDevToolsExtension(path)`
-* `BrowserWindow.removeExtension(name)`
-* `BrowserWindow.removeDevToolsExtension(name)`
-* `BrowserWindow.getExtensions()`
-* `BrowserWindow.getDevToolsExtensions()`
-
-Use the session APIs instead:
-* `ses.loadExtension(path)`
-* `ses.removeExtension(extension_id)`
-* `ses.getAllExtensions()`
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.addExtension(path)
-BrowserWindow.addDevToolsExtension(path)
-// Replace with
-session.defaultSession.loadExtension(path)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.removeExtension(name)
-BrowserWindow.removeDevToolsExtension(name)
-// Replace with
-session.defaultSession.removeExtension(extension_id)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.getExtensions()
-BrowserWindow.getDevToolsExtensions()
-// Replace with
-session.defaultSession.getAllExtensions()
-```
-
 ### Removed: `<webview>.getWebContents()`

 This API, which was deprecated in Electron 8.0, is now removed.
@@ -467,52 +392,6 @@ in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
 limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
 [here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).

-### Deprecated events in `systemPreferences`
-
-The following `systemPreferences` events have been deprecated:
-* `inverted-color-scheme-changed`
-* `high-contrast-color-scheme-changed`
-
-Use the new `updated` event on the `nativeTheme` module instead.
-
-```js
-// Deprecated
-systemPreferences.on('inverted-color-scheme-changed', () => { /* ... */ })
-systemPreferences.on('high-contrast-color-scheme-changed', () => { /* ... */ })
-
-// Replace with
-nativeTheme.on('updated', () => { /* ... */ })
-```
-
-### Deprecated: methods in `systemPreferences`
-
-The following `systemPreferences` methods have been deprecated:
-* `systemPreferences.isDarkMode()`
-* `systemPreferences.isInvertedColorScheme()`
-* `systemPreferences.isHighContrastColorScheme()`
-
-Use the following `nativeTheme` properties instead:
-* `nativeTheme.shouldUseDarkColors`
-* `nativeTheme.shouldUseInvertedColorScheme`
-* `nativeTheme.shouldUseHighContrastColors`
-
-```js
-// Deprecated
-systemPreferences.isDarkMode()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Deprecated
-systemPreferences.isInvertedColorScheme()
-// Replace with
-nativeTheme.shouldUseInvertedColorScheme
-
-// Deprecated
-systemPreferences.isHighContrastColorScheme()
-// Replace with
-nativeTheme.shouldUseHighContrastColors
-```
-
 ## Planned Breaking API Changes (7.0)

 ### Deprecated: Atom.io Node Headers URL
--- a/docs/development/build-instructions-macos.md
+++ b/docs/development/build-instructions-macos.md
@@ -42,7 +42,7 @@ $ pip install pyobjc
 If you're developing Electron and don't plan to redistribute your
 custom Electron build, you may skip this section.

-Official Electron builds are built with [Xcode 12.2](https://download.developer.apple.com/Developer_Tools/Xcode_12.2/Xcode_12.2.xip), and the macOS 11.0 SDK. Building with a newer SDK works too, but the releases currently use the 11.0 SDK.
+Official Electron builds are built with [Xcode 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the macOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.

 ## Building Electron

--- a/docs/development/issues.md
+++ b/docs/development/issues.md
@@ -33,11 +33,48 @@ contributing, and more. Please use the issue tracker for bugs only!
 To submit a bug report:

 When opening a new issue in the [`electron/electron` issue tracker](https://github.com/electron/electron/issues/new/choose), users
-will be presented with [a template](https://github.com/electron/electron/blob/master/.github/ISSUE_TEMPLATE/Bug_report.md)
-that should be filled in.
+will be presented with a template that should be filled in.

-If you believe that you have found a bug in Electron, please fill out the template
-to the best of your ability.
+```markdown
+<!--
+Thanks for opening an issue! A few things to keep in mind:
+
+- The issue tracker is only for bugs and feature requests.
+- Before reporting a bug, please try reproducing your issue against
+  the latest version of Electron.
+- If you need general advice, join our Slack: http://atom-slack.herokuapp.com
+-->
+
+* Electron version:
+* Operating system:
+
+### Expected behavior
+
+<!-- What do you think should happen? -->
+
+### Actual behavior
+
+<!-- What actually happens? -->
+
+### How to reproduce
+
+<!--
+
+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
+
+You can fork 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.
+
+  $ git clone $YOUR_URL -b $BRANCH
+  $ npm install
+  $ npm start || electron .
+
+-->
+```
+
+If you believe that you have found a bug in Electron, please fill out this
+form to the best of your ability.

 The two most important pieces of information needed to evaluate the report are
 a description of the bug and a simple test case to recreate it. It is easier to fix
--- a/docs/fiddles/features/drag-and-drop/index.html
+++ b/docs/fiddles/features/drag-and-drop/index.html
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <a href="#" id="drag">Drag me</a>
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/drag-and-drop/main.js
+++ b/docs/fiddles/features/drag-and-drop/main.js
@@ -1,41 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeImage, NativeImage } = require('electron')
-const fs = require('fs');
-const http = require('http');
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-const iconName = 'iconForDragAndDrop.png';
-const icon = fs.createWriteStream(`${process.cwd()}/${iconName}`);
-http.get('http://img.icons8.com/ios/452/drag-and-drop.png', (response) => {
-  response.pipe(icon);
-});
-
-app.whenReady().then(createWindow)
-
-ipcMain.on('ondragstart', (event, filePath) => {
-  event.sender.startDrag({
-    file: filePath,
-    icon: `${process.cwd()}/${iconName}`
-  })
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/drag-and-drop/renderer.js
+++ b/docs/fiddles/features/drag-and-drop/renderer.js
@@ -1,9 +0,0 @@
-const { ipcRenderer } = require('electron')
-const fs = require('fs')
-
-document.getElementById('drag').ondragstart = (event) => {
-  const fileName = 'drag-and-drop.md'
-  fs.writeFileSync(fileName, '# Test drag and drop');
-  event.preventDefault()
-  ipcRenderer.send('ondragstart', process.cwd() + `/${fileName}`)
-}
--- a/docs/fiddles/features/keyboard-shortcuts/global/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/global/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/global/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/global/main.js
@@ -1,31 +0,0 @@
-const { app, BrowserWindow, globalShortcut } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  globalShortcut.register('Alt+CommandOrControl+I', () => {
-    console.log('Electron loves global shortcuts!')
-  })
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/keyboard-shortcuts/interception-from-main/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/interception-from-main/index.html
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    We are using node <script>document.write(process.versions.node)</script>,
-    Chrome <script>document.write(process.versions.chrome)</script>,
-    and Electron <script>document.write(process.versions.electron)</script>.
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js
@@ -1,13 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true } })
-
-  win.loadFile('index.html')
-  win.webContents.on('before-input-event', (event, input) => {
-    if (input.control && input.key.toLowerCase() === 'i') {
-      console.log('Pressed Control+I')
-      event.preventDefault()
-    }
-  })
-})
--- a/docs/fiddles/features/keyboard-shortcuts/local/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/local/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/local/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/local/main.js
@@ -1,39 +0,0 @@
-const { app, BrowserWindow, Menu, MenuItem } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-const menu = new Menu()
-menu.append(new MenuItem({
-  label: 'Electron',
-  submenu: [{
-    role: 'help',
-    accelerator: process.platform === 'darwin' ? 'Alt+Cmd+I' : 'Alt+Shift+I',
-    click: () => { console.log('Electron rocks!') }
-  }]
-}))
-
-Menu.setApplicationMenu(menu)
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/macos-dark-mode/index.html
+++ b/docs/fiddles/features/macos-dark-mode/index.html
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-    <link rel="stylesheet" type="text/css" href="./styles.css">
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Current theme source: <strong id="theme-source">System</strong></p>
-
-    <button id="toggle-dark-mode">Toggle Dark Mode</button>
-    <button id="reset-to-system">Reset to System Theme</button>
-
-    <script src="renderer.js"></script>
-  </body>
-</body>
-</html>
--- a/docs/fiddles/features/macos-dark-mode/main.js
+++ b/docs/fiddles/features/macos-dark-mode/main.js
@@ -1,40 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-
-  ipcMain.handle('dark-mode:toggle', () => {
-    if (nativeTheme.shouldUseDarkColors) {
-      nativeTheme.themeSource = 'light'
-    } else {
-      nativeTheme.themeSource = 'dark'
-    }
-    return nativeTheme.shouldUseDarkColors
-  })
-
-  ipcMain.handle('dark-mode:system', () => {
-    nativeTheme.themeSouce = 'system'
-  })
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/macos-dark-mode/renderer.js
+++ b/docs/fiddles/features/macos-dark-mode/renderer.js
@@ -1,11 +0,0 @@
-const { ipcRenderer } = require('electron')
-
-document.getElementById('toggle-dark-mode').addEventListener('click', async () => {
-  const isDarkMode = await ipcRenderer.invoke('dark-mode:toggle')
-  document.getElementById('theme-source').innerHTML = isDarkMode ? 'Dark' : 'Light'
-})
-
-document.getElementById('reset-to-system').addEventListener('click', async () => {
-  await ipcRenderer.invoke('dark-mode:system')
-  document.getElementById('theme-source').innerHTML = 'System'
-})
--- a/docs/fiddles/features/macos-dark-mode/styles.css
+++ b/docs/fiddles/features/macos-dark-mode/styles.css
@@ -1,7 +0,0 @@
-@media (prefers-color-scheme: dark) {
-  body { background: #333; color: white; }
-}
-
-@media (prefers-color-scheme: light) {
-  body { background: #ddd; color: black; }
-}
--- a/docs/fiddles/features/macos-dock-menu/index.html
+++ b/docs/fiddles/features/macos-dock-menu/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/macos-dock-menu/main.js
+++ b/docs/fiddles/features/macos-dock-menu/main.js
@@ -1,43 +0,0 @@
-const { app, BrowserWindow, Menu } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-const dockMenu = Menu.buildFromTemplate([
-  {
-    label: 'New Window',
-    click () { console.log('New Window') }
-  }, {
-    label: 'New Window with Settings',
-    submenu: [
-      { label: 'Basic' },
-      { label: 'Pro' }
-    ]
-  },
-  { label: 'New Command...' }
-])
-
-app.whenReady().then(() => {
-  app.dock.setMenu(dockMenu)
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/main/index.html
+++ b/docs/fiddles/features/notifications/main/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/notifications/main/main.js
+++ b/docs/fiddles/features/notifications/main/main.js
@@ -1,35 +0,0 @@
-const { app, BrowserWindow, Notification } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-function showNotification () {
-  const notification = {
-    title: 'Basic Notification',
-    body: 'Notification from the Main process'
-  }
-  new Notification(notification).show()
-}
-
-app.whenReady().then(createWindow).then(showNotification)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/renderer/index.html
+++ b/docs/fiddles/features/notifications/renderer/index.html
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/notifications/renderer/main.js
+++ b/docs/fiddles/features/notifications/renderer/main.js
@@ -1,27 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/renderer/renderer.js
+++ b/docs/fiddles/features/notifications/renderer/renderer.js
@@ -1,7 +0,0 @@
-const myNotification = new Notification('Title', {
-  body: 'Notification from the Renderer process'
-})
-
-myNotification.onclick = () => {
-  console.log('Notification clicked')
-}
--- a/docs/fiddles/features/offscreen-rendering/index.html
+++ b/docs/fiddles/features/offscreen-rendering/index.html
@@ -1,15 +0,0 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/offscreen-rendering/main.js
+++ b/docs/fiddles/features/offscreen-rendering/main.js
@@ -1,28 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-const fs = require('fs')
-
-app.disableHardwareAcceleration()
-
-let win
-
-app.whenReady().then(() => {
-  win = new BrowserWindow({ webPreferences: { offscreen: true } })
-  win.loadURL('https://github.com')
-  win.webContents.on('paint', (event, dirty, image) => {
-    fs.writeFileSync('ex.png', image.toPNG())
-  })
-  win.webContents.setFrameRate(60)
-  console.log(`The screenshot has been successfully saved to ${process.cwd()}/ex.png`)
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/online-detection/main/index.html
+++ b/docs/fiddles/features/online-detection/main/index.html
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/online-detection/main/main.js
+++ b/docs/fiddles/features/online-detection/main/main.js
@@ -1,24 +0,0 @@
-const { app, BrowserWindow, ipcMain } = require('electron')
-
-let onlineStatusWindow
-
-app.whenReady().then(() => {
-  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false, webPreferences: { nodeIntegration: true } })
-  onlineStatusWindow.loadURL(`file://${__dirname}/index.html`)
-})
-
-ipcMain.on('online-status-changed', (event, status) => {
-  console.log(status)
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/online-detection/main/renderer.js
+++ b/docs/fiddles/features/online-detection/main/renderer.js
@@ -1,7 +0,0 @@
-const { ipcRenderer } = require('electron')
-const updateOnlineStatus = () => { ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline') }
-
-window.addEventListener('online', updateOnlineStatus)
-window.addEventListener('offline', updateOnlineStatus)
-
-updateOnlineStatus()
--- a/docs/fiddles/features/online-detection/renderer/index.html
+++ b/docs/fiddles/features/online-detection/renderer/index.html
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/online-detection/renderer/main.js
+++ b/docs/fiddles/features/online-detection/renderer/main.js
@@ -1,20 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-let onlineStatusWindow
-
-app.whenReady().then(() => {
-  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false })
-  onlineStatusWindow.loadURL(`file://${__dirname}/index.html`)
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/online-detection/renderer/renderer.js
+++ b/docs/fiddles/features/online-detection/renderer/renderer.js
@@ -1,6 +0,0 @@
-const alertOnlineStatus = () => { window.alert(navigator.onLine ? 'online' : 'offline') }
-
-window.addEventListener('online', alertOnlineStatus)
-window.addEventListener('offline', alertOnlineStatus)
-
-alertOnlineStatus()
--- a/docs/fiddles/features/progress-bar/index.html
+++ b/docs/fiddles/features/progress-bar/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/progress-bar/main.js
+++ b/docs/fiddles/features/progress-bar/main.js
@@ -1,30 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-  win.setProgressBar(0.5)
-}
-
-
-app.whenReady().then(createWindow)
-
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/recent-documents/index.html
+++ b/docs/fiddles/features/recent-documents/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/recent-documents/main.js
+++ b/docs/fiddles/features/recent-documents/main.js
@@ -1,34 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-const fs = require('fs')
-const path = require('path')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-const fileName = 'recently-used.md'
-fs.writeFile(fileName, 'Lorem Ipsum', () => {
-  app.addRecentDocument(path.join(process.cwd(), `${fileName}`))
-})
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  app.clearRecentDocuments()
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/represented-file/index.html
+++ b/docs/fiddles/features/represented-file/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/features/represented-file/main.js
+++ b/docs/fiddles/features/represented-file/main.js
@@ -1,33 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-const os = require('os');
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow()
-
-  win.setRepresentedFilename(os.homedir())
-  win.setDocumentEdited(true)
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/quick-start/index.html
+++ b/docs/fiddles/quick-start/index.html
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
--- a/docs/fiddles/quick-start/main.js
+++ b/docs/fiddles/quick-start/main.js
@@ -1,27 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/tutorial/development-environment.md
+++ b/docs/tutorial/development-environment.md
@@ -0,0 +1,117 @@
+# Developer Environment
+
+Electron development is essentially Node.js development. To turn your operating
+system into an environment capable of building desktop apps with Electron,
+you will merely need Node.js, npm, a code editor of your choice, and a
+rudimentary understanding of your operating system's command line client.
+
+## Setting up macOS
+
+> Electron supports macOS 10.10 (Yosemite) and up. Apple
+does not allow running macOS in virtual machines unless the host computer is
+already an Apple computer, so if you find yourself in need of a Mac, consider
+using a cloud service that rents access to Macs (like [MacInCloud][macincloud]
+or [xcloud](https://xcloud.me)).
+
+First, install a recent version of Node.js. We recommend that you install
+either the latest `LTS` or `Current` version available. Visit
+[the Node.js download page][node-download] and select the `macOS Installer`.
+While Homebrew is an offered option, but we recommend against it - many tools
+will be incompatible with the way Homebrew installs Node.js.
+
+Once downloaded, execute the installer and let the installation wizard guide
+you through the installation.
+
+Once installed, confirm that everything works as expected. Find the macOS
+`Terminal` application in your `/Applications/Utilities` folder (or by
+searching for the word `Terminal` in Spotlight). Open up `Terminal`
+or another command line client of your choice and confirm that both `node`
+and `npm` are available:
+
+```sh
+# This command should print the version of Node.js
+node -v
+
+# This command should print the version of npm
+npm -v
+```
+
+If both commands printed a version number, you are all set! Before you get
+started, you might want to install a [code editor](#a-good-editor) suited
+for JavaScript development.
+
+## Setting up Windows
+
+> Electron supports Windows 7 and later versions – attempting to develop Electron
+applications on earlier versions of Windows will not work. Microsoft provides
+free [virtual machine images with Windows 10][windows-vm] for developers.
+
+First, install a recent version of Node.js. We recommend that you install
+either the latest `LTS` or `Current` version available. Visit
+[the Node.js download page][node-download] and select the `Windows Installer`.
+Once downloaded, execute the installer and let the installation wizard guide
+you through the installation.
+
+On the screen that allows you to configure the installation, make sure to
+select the `Node.js runtime`, `npm package manager`, and `Add to PATH`
+options.
+
+Once installed, confirm that everything works as expected. Find the Windows
+PowerShell by opening the Start Menu and typing `PowerShell`. Open
+up `PowerShell` or another command line client of your choice and confirm that
+both `node` and `npm` are available:
+
+```powershell
+# This command should print the version of Node.js
+node -v
+
+# This command should print the version of npm
+npm -v
+```
+
+If both commands printed a version number, you are all set! Before you get
+started, you might want to install a [code editor](#a-good-editor) suited
+for JavaScript development.
+
+## Setting up Linux
+
+> Generally speaking, Electron supports Ubuntu 12.04, Fedora 21, Debian 8
+and later.
+
+First, install a recent version of Node.js. Depending on your Linux
+distribution, the installation steps might differ. Assuming that you normally
+install software using a package manager like `apt` or `pacman`, use the
+official [Node.js guidance on installing on Linux][node-package].
+
+You're running Linux, so you likely already know how to operate a command line
+client. Open up your favorite client and confirm that both `node` and `npm`
+are available globally:
+
+```sh
+# This command should print the version of Node.js
+node -v
+
+# This command should print the version of npm
+npm -v
+```
+
+If both commands printed a version number, you are all set! Before you get
+started, you might want to install a [code editor](#a-good-editor) suited
+for JavaScript development.
+
+## A Good Editor
+
+We might suggest two free popular editors built in Electron:
+GitHub's [Atom][atom] and Microsoft's [Visual Studio Code][code]. Both of
+them have excellent JavaScript support.
+
+If you are one of the many developers with a strong preference, know that
+virtually all code editors and IDEs these days support JavaScript.
+
+[macincloud]: https://www.macincloud.com/
+[xcloud]: https://xcloud.me
+[node-download]: https://nodejs.org/en/download/
+[node-package]: https://nodejs.org/en/download/package-manager/
+[atom]: https://atom.io/
+[code]: https://code.visualstudio.com/
+[windows-vm]: https://developer.microsoft.com/en-us/windows/downloads/virtual-machines
--- a/docs/tutorial/devtools-extension.md
+++ b/docs/tutorial/devtools-extension.md
@@ -1,28 +1,25 @@
 # DevTools Extension

-Electron supports [Chrome DevTools extensions][devtools-extension], which can
-be used to extend the ability of Chrome's developer tools for debugging
-popular web frameworks.
+Electron supports the [Chrome DevTools Extension][devtools-extension], which can
+be used to extend the ability of devtools for debugging popular web frameworks.

-## Loading a DevTools extension with tooling
+## How to load a DevTools Extension

-The easiest way to load a DevTools extension is to use third-party tooling to automate the
-process for you. [electron-devtools-installer][electron-devtools-installer] is a popular
-NPM package that does just that.
+This document outlines the process for manually loading an extension.
+You may also try
+[electron-devtools-installer](https://github.com/GPMDP/electron-devtools-installer),
+a third-party tool that downloads extensions directly from the Chrome WebStore.

-## Manually loading a DevTools extension
+To load an extension in Electron, you need to download it in Chrome browser,
+locate its filesystem path, and then load it by calling the
+`BrowserWindow.addDevToolsExtension(extension)` API.

-If you don't want to use the tooling approach, you can also do all of the necessary
-operations by hand. To load an extension in Electron, you need to download it via Chrome,
-locate its filesystem path, and then load it into your [Session][session] by calling the
-[`ses.loadExtension`] API.
+Using the [React Developer Tools][react-devtools] as example:

-Using the [React Developer Tools][react-devtools] as an example:
-
-1. Install the extension in Google Chrome.
+1. Install it in Chrome browser.
 1. Navigate to `chrome://extensions`, and find its extension ID, which is a hash
   string like `fmkadmapgofadopljbjfkapdkoienihi`.
-1. Find out the filesystem location used by Chrome for storing extensions:
+1. Find out filesystem location used by Chrome for storing extensions:
   * on Windows it is `%LOCALAPPDATA%\Google\Chrome\User Data\Default\Extensions`;
   * on Linux it could be:
     * `~/.config/google-chrome/Default/Extensions/`
@@ -30,48 +27,37 @@ Using the [React Developer Tools][react-devtools] as an example:
     * `~/.config/google-chrome-canary/Default/Extensions/`
     * `~/.config/chromium/Default/Extensions/`
   * on macOS it is `~/Library/Application Support/Google/Chrome/Default/Extensions`.
-1. Pass the location of the extension to the [`ses.loadExtension`][load-extension]
-   API. For React Developer Tools `v4.9.0`, it looks something like:
+1. Pass the location of the extension to `BrowserWindow.addDevToolsExtension`
+   API, for the React Developer Tools, it is something like:
+
   ```javascript
-    const { app, session } = require('electron')
-    const path = require('path')
-    const os = require('os')
+   const path = require('path')
+   const os = require('os')

-    // on macOS
-    const reactDevToolsPath = path.join(
-      os.homedir(),
-      '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.9.0_0'
-    )
-
-    app.whenReady().then(async () => {
-      await session.defaultSession.loadExtension(reactDevToolsPath)
-    })
+   BrowserWindow.addDevToolsExtension(
+      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.3.0_0')
+   )
   ```

-**Notes:**
+**Note:** The `BrowserWindow.addDevToolsExtension` API cannot be called before the
+ready event of the app module is emitted.

-* `loadExtension` returns a Promise with an [Extension object][extension-structure],
-which contains metadata about the extension that was loaded. This promise needs to
-resolve (e.g. with an `await` expression) before loading a page. Otherwise, the
-extension won't be guaranteed to load.
-* `loadExtension` cannot be called before the `ready` event of the `app` module
-is emitted, nor can it be called on in-memory (non-persistent) sessions.
-* `loadExtension` must be called on every boot of your app if you want the
-extension to be loaded.
+The extension will be remembered so you only need to call this API once per
+extension. If you try to add an extension that has already been loaded, this method
+will not return and instead log a warning to the console.

-### Removing a DevTools extension
+### How to remove a DevTools Extension

-You can pass the extension's ID to the [`ses.removeExtension`][remove-extension] API to
-remove it from your Session. Loaded extensions are not persisted between
-app launches.
+You can pass the name of the extension to the `BrowserWindow.removeDevToolsExtension`
+API to remove it. The name of the extension is returned by
+`BrowserWindow.addDevToolsExtension` and you can get the names of all installed
+DevTools Extensions using the `BrowserWindow.getDevToolsExtensions` API.

-## DevTools extension support
+## Supported DevTools Extensions

-Electron only supports
-[a limited set of `chrome.*` APIs][supported-extension-apis],
-so extensions using unsupported `chrome.*` APIs under the hood may not work.
-
-The following Devtools extensions have been tested to work in Electron:
+Electron only supports a limited set of `chrome.*` APIs, so some extensions
+using unsupported `chrome.*` APIs for chrome extension features may not work.
+Following Devtools Extensions are tested and guaranteed to work in Electron:

 * [Ember Inspector](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
 * [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi)
@@ -83,22 +69,14 @@ The following Devtools extensions have been tested to work in Electron:
 * [Redux DevTools Extension](https://chrome.google.com/webstore/detail/redux-devtools/lmhkpmbekcpmknklioeibfkpmmfibljd)
 * [MobX Developer Tools](https://chrome.google.com/webstore/detail/mobx-developer-tools/pfgnfdagidkfgccljigdamigbcnndkod)

-### What should I do if a DevTools extension is not working?
+### What should I do if a DevTools Extension is not working?

-First, please make sure the extension is still being maintained and is compatible
-with the latest version of Google Chrome. We cannot provide additional support for
-unsupported extensions.
+First please make sure the extension is still being maintained, some extensions
+can not even work for recent versions of Chrome browser, and we are not able to
+do anything for them.

-If the extension works on Chrome but not on Electron, file a bug in Electron's
-[issue tracker][issue-tracker] and describe which part
-of the extension is not working as expected.
+Then file a bug at Electron's issues list, and describe which part of the
+extension is not working as expected.

 [devtools-extension]: https://developer.chrome.com/extensions/devtools
-[session]: ../api/session.md
 [react-devtools]: https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi
-[load-extension]: ../api/session.md#sesloadextensionpath-options
-[extension-structure]: ../api/structures/extension.md
-[remove-extension]: ../api/session.md#sesremoveextensionextensionid
-[electron-devtools-installer]: https://github.com/MarshallOfSound/electron-devtools-installer
-[supported-extension-apis]: ../api/extensions.md
-[issue-tracker]: https://github.com/electron/electron/issues
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -17,5 +17,5 @@
 | 8.0.0 | 2019-10-24 | 2020-02-04 | M80 | v12.13 |
 | 9.0.0 | 2020-02-06 | 2020-05-19 | M83 | v12.14 |
 | 10.0.0 | 2020-05-21 | 2020-08-25 | M85 | v12.16 |
-| 11.0.0 | 2020-08-27 | 2020-11-17 | M87 | v12.18 |
-| 12.0.0 | 2020-11-19 | 2021-03-02 | M89 | v14.x |
+| 11.0.0 | 2020-08-27 | 2020-11-17 | M87 | v12.x |
+| 12.0.0 | TBD | TBD | TBD | TBD |
--- a/docs/tutorial/offscreen-rendering.md
+++ b/docs/tutorial/offscreen-rendering.md
@@ -9,7 +9,7 @@ Two modes of rendering can be used and only the dirty area is passed in the
 `'paint'` event to be more efficient. The rendering can be stopped, continued
 and the frame rate can be set. The specified frame rate is a top limit value,
 when there is nothing happening on a webpage, no frames are generated. The
-maximum frame rate is 240, because above that there is no benefit, only
+maximum frame rate is 60, because above that there is no benefit, only
 performance loss.

 **Note:** An offscreen window is always created as a [Frameless Window](../api/frameless-window.md).
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -106,7 +106,7 @@ The `index.html` page looks as follows:
    <title>Hello World!</title>
    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
 </head>
-<body style="background: white;">
+<body>
    <h1>Hello World!</h1>
    We are using node <script>document.write(process.versions.node)</script>,
    Chrome <script>document.write(process.versions.chrome)</script>,
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -233,8 +233,8 @@ practice, that means that global objects like `Array.prototype.push` or
 Electron uses the same technology as Chromium's [Content Scripts](https://developer.chrome.com/extensions/content_scripts#execution-environment)
 to enable this behavior.

-Even when `nodeIntegration: false` is used, to truly enforce strong isolation
-and prevent the use of Node primitives `contextIsolation` **must** also be used.
+Even when you use `nodeIntegration: false` to enforce strong isolation and
+prevent the use of Node primitives, `contextIsolation` must also be used.

 ### Why & How?

@@ -818,8 +818,8 @@ which potential security issues are not as widely known.
 [browser-view]: ../api/browser-view.md
 [webview-tag]: ../api/webview-tag.md
 [web-contents]: ../api/web-contents.md
-[window-open-handler]: ../api/web-contents.md#contentssetwindowopenhandlerhandler
-[will-navigate]: ../api/web-contents.md#event-will-navigate
+[window-open-handler]: ../api/web-contents.md#contentssetwindowopenhandler-handler
+[will-navigate]: ../api/web-contents.md#event-will-navigateexperimental
 [open-external]: ../api/shell.md#shellopenexternalurl-options
 [sandbox]: ../api/sandbox-option.md
 [responsible-disclosure]: https://en.wikipedia.org/wiki/Responsible_disclosure
--- a/docs/tutorial/support.md
+++ b/docs/tutorial/support.md
@@ -64,9 +64,9 @@ until the maintainers feel the maintenance burden is too high to continue doing

 ### Currently supported versions

- 11.x.y
 - 10.x.y
 - 9.x.y
+- 8.x.y

 ### End-of-life

--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -91,19 +91,12 @@ template("electron_extra_paks") {
    }

    # New paks should be added here by default.
-    sources += [
-      "$root_gen_dir/content/browser/devtools/devtools_resources.pak",
-      "$root_gen_dir/ui/resources/webui_generated_resources.pak",
-    ]
+    sources +=
+        [ "$root_gen_dir/content/browser/devtools/devtools_resources.pak" ]
    deps += [ "//content/browser/devtools:devtools_resources" ]
-    if (enable_pdf_viewer) {
-      sources += [ "$root_gen_dir/chrome/pdf_resources.pak" ]
-      deps += [ "//chrome/browser/resources/pdf:pdf_resources" ]
-    }
    if (enable_print_preview) {
      sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
-      deps +=
-          [ "//chrome/browser/resources/print_preview:print_preview_resources" ]
+      deps += [ "//chrome/browser/resources:print_preview_resources" ]
    }
    if (enable_electron_extensions) {
      sources += [
--- a/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -83,18 +83,5 @@
  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
    More actions
-  </message>
-  <!-- Badging -->
-  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
-    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
-    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
-    Unread Notifications
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
-    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
-  </message>  
+</message>
 </grit-part>
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -73,6 +73,7 @@ auto_filenames = {
    "docs/api/webview-tag.md",
    "docs/api/window-open.md",
    "docs/api/structures/bluetooth-device.md",
+    "docs/api/structures/cancellable-navigation-event.md",
    "docs/api/structures/certificate-principal.md",
    "docs/api/structures/certificate.md",
    "docs/api/structures/cookie.md",
--- a/filenames.gni
+++ b/filenames.gni
@@ -283,7 +283,6 @@ filenames = {
    "shell/browser/api/electron_api_power_monitor.h",
    "shell/browser/api/electron_api_power_save_blocker.cc",
    "shell/browser/api/electron_api_power_save_blocker.h",
-    "shell/browser/api/electron_api_printing.cc",
    "shell/browser/api/electron_api_protocol.cc",
    "shell/browser/api/electron_api_protocol.h",
    "shell/browser/api/electron_api_screen.cc",
@@ -328,10 +327,6 @@ filenames = {
    "shell/browser/api/ui_event.h",
    "shell/browser/auto_updater.cc",
    "shell/browser/auto_updater.h",
-    "shell/browser/badging/badge_manager.cc",
-    "shell/browser/badging/badge_manager.h",
-    "shell/browser/badging/badge_manager_factory.cc",
-    "shell/browser/badging/badge_manager_factory.h",
    "shell/browser/browser.cc",
    "shell/browser/browser.h",
    "shell/browser/browser_observer.h",
@@ -349,8 +344,6 @@ filenames = {
    "shell/browser/electron_browser_client.h",
    "shell/browser/electron_browser_context.cc",
    "shell/browser/electron_browser_context.h",
-    "shell/browser/electron_browser_handler_impl.cc",
-    "shell/browser/electron_browser_handler_impl.h",
    "shell/browser/electron_browser_main_parts.cc",
    "shell/browser/electron_browser_main_parts.h",
    "shell/browser/electron_download_manager_delegate.cc",
@@ -529,7 +522,6 @@ filenames = {
    "shell/common/electron_paths.h",
    "shell/common/gin_converters/accelerator_converter.cc",
    "shell/common/gin_converters/accelerator_converter.h",
-    "shell/common/gin_converters/base_converter.h",
    "shell/common/gin_converters/blink_converter.cc",
    "shell/common/gin_converters/blink_converter.h",
    "shell/common/gin_converters/callback_converter.h",
--- a/lib/asar/fs-wrapper.ts
+++ b/lib/asar/fs-wrapper.ts
@@ -615,10 +615,9 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (options.withFileTypes) {
      const dirents = [];
      for (const file of files) {
-        const childPath = path.join(filePath, file);
-        const stats = archive.stat(childPath);
+        const stats = archive.stat(file);
        if (!stats) {
-          const error = createError(AsarError.NOT_FOUND, { asarPath, filePath: childPath });
+          const error = createError(AsarError.NOT_FOUND, { asarPath, filePath: file });
          nextTick(callback!, [error]);
          return;
        }
@@ -658,10 +657,9 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (options && (options as any).withFileTypes) {
      const dirents = [];
      for (const file of files) {
-        const childPath = path.join(filePath, file);
-        const stats = archive.stat(childPath);
+        const stats = archive.stat(file);
        if (!stats) {
-          throw createError(AsarError.NOT_FOUND, { asarPath, filePath: childPath });
+          throw createError(AsarError.NOT_FOUND, { asarPath, filePath: file });
        }
        if (stats.isFile) {
          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_FILE));
@@ -691,8 +689,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (info.size === 0) return ['', false];
    if (info.unpacked) {
      const realPath = archive.copyFileOut(filePath);
-      const str = fs.readFileSync(realPath, { encoding: 'utf8' });
-      return [str, str.length > 0];
+      return fs.readFileSync(realPath, { encoding: 'utf8' });
    }

    logASARAccess(asarPath, filePath, info.offset);
--- a/lib/browser/api/browser-window.ts
+++ b/lib/browser/api/browser-window.ts
@@ -96,7 +96,11 @@ BrowserWindow.fromWebContents = (webContents: WebContents) => {
 };

 BrowserWindow.fromBrowserView = (browserView: BrowserView) => {
-  return BrowserWindow.fromWebContents(browserView.webContents);
+  for (const window of BrowserWindow.getAllWindows()) {
+    if (window.getBrowserView() === browserView) return window;
+  }
+
+  return null;
 };

 BrowserWindow.prototype.setTouchBar = function (touchBar) {
--- a/lib/browser/api/crash-reporter.ts
+++ b/lib/browser/api/crash-reporter.ts
@@ -51,6 +51,10 @@ class CrashReporter {
    return binding.getUploadedReports();
  }

+  getCrashesDirectory () {
+    return app.getPath('crashDumps');
+  }
+
  getUploadToServer () {
    if (process.type === 'browser') {
      return binding.getUploadToServer();
--- a/lib/browser/api/menu-item-roles.ts
+++ b/lib/browser/api/menu-item-roles.ts
@@ -1,4 +1,4 @@
-import { app, BrowserWindow, session, webContents, WebContents, MenuItemConstructorOptions } from 'electron/main';
+import { app, BrowserWindow, WebContents, MenuItemConstructorOptions } from 'electron/main';

 const isMac = process.platform === 'darwin';
 const isWindows = process.platform === 'win32';
@@ -6,12 +6,10 @@ const isLinux = process.platform === 'linux';

 type RoleId = 'about' | 'close' | 'copy' | 'cut' | 'delete' | 'forcereload' | 'front' | 'help' | 'hide' | 'hideothers' | 'minimize' |
  'paste' | 'pasteandmatchstyle' | 'quit' | 'redo' | 'reload' | 'resetzoom' | 'selectall' | 'services' | 'recentdocuments' | 'clearrecentdocuments' | 'startspeaking' | 'stopspeaking' |
-  'toggledevtools' | 'togglefullscreen' | 'undo' | 'unhide' | 'window' | 'zoom' | 'zoomin' | 'zoomout' | 'togglespellchecker' |
-  'appmenu' | 'filemenu' | 'editmenu' | 'viewmenu' | 'windowmenu' | 'sharemenu'
+  'toggledevtools' | 'togglefullscreen' | 'undo' | 'unhide' | 'window' | 'zoom' | 'zoomin' | 'zoomout' | 'appmenu' | 'filemenu' | 'editmenu' | 'viewmenu' | 'windowmenu' | 'sharemenu'
 interface Role {
  label: string;
  accelerator?: string;
-  checked?: boolean;
  windowMethod?: ((window: BrowserWindow) => void);
  webContentsMethod?: ((webContents: WebContents) => void);
  appMethod?: () => void;
@@ -182,19 +180,6 @@ export const roleList: Record<RoleId, Role> = {
      webContents.zoomLevel -= 0.5;
    }
  },
-  togglespellchecker: {
-    label: 'Check Spelling While Typing',
-    get checked () {
-      const wc = webContents.getFocusedWebContents();
-      const ses = wc ? wc.session : session.defaultSession;
-      return ses.spellCheckerEnabled;
-    },
-    nonNativeMacOSRole: true,
-    webContentsMethod: (wc: WebContents) => {
-      const ses = wc ? wc.session : session.defaultSession;
-      ses.spellCheckerEnabled = !ses.spellCheckerEnabled;
-    }
-  },
  // App submenu should be used for Mac only
  appmenu: {
    get label () {
@@ -296,23 +281,10 @@ const canExecuteRole = (role: keyof typeof roleList) => {
  return roleList[role].nonNativeMacOSRole;
 };

-export function getDefaultType (role: RoleId) {
-  if (shouldOverrideCheckStatus(role)) return 'checkbox';
-  return 'normal';
-}
-
 export function getDefaultLabel (role: RoleId) {
  return hasRole(role) ? roleList[role].label : '';
 }

-export function getCheckStatus (role: RoleId) {
-  if (hasRole(role)) return roleList[role].checked;
-}
-
-export function shouldOverrideCheckStatus (role: RoleId) {
-  return hasRole(role) && Object.prototype.hasOwnProperty.call(roleList[role], 'checked');
-}
-
 export function getDefaultAccelerator (role: RoleId) {
  if (hasRole(role)) return roleList[role].accelerator;
 }
--- a/lib/browser/api/menu-item.ts
+++ b/lib/browser/api/menu-item.ts
@@ -22,7 +22,7 @@ const MenuItem = function (this: any, options: any) {
    throw new Error('Invalid submenu');
  }

-  this.overrideReadOnlyProperty('type', roles.getDefaultType(this.role));
+  this.overrideReadOnlyProperty('type', 'normal');
  this.overrideReadOnlyProperty('role');
  this.overrideReadOnlyProperty('accelerator');
  this.overrideReadOnlyProperty('icon');
@@ -46,8 +46,7 @@ const MenuItem = function (this: any, options: any) {
  const click = options.click;
  this.click = (event: Event, focusedWindow: BrowserWindow, focusedWebContents: WebContents) => {
    // Manually flip the checked flags when clicked.
-    if (!roles.shouldOverrideCheckStatus(this.role) &&
-        (this.type === 'checkbox' || this.type === 'radio')) {
+    if (this.type === 'checkbox' || this.type === 'radio') {
      this.checked = !this.checked;
    }

@@ -67,11 +66,6 @@ MenuItem.prototype.getDefaultRoleAccelerator = function () {
  return roles.getDefaultAccelerator(this.role);
 };

-MenuItem.prototype.getCheckStatus = function () {
-  if (!roles.shouldOverrideCheckStatus(this.role)) return this.checked;
-  return roles.getCheckStatus(this.role);
-};
-
 MenuItem.prototype.overrideProperty = function (name: string, defaultValue: any = null) {
  if (this[name] == null) {
    this[name] = defaultValue;
--- a/lib/browser/api/menu.ts
+++ b/lib/browser/api/menu.ts
@@ -17,9 +17,7 @@ Menu.prototype._init = function () {
 };

 Menu.prototype._isCommandIdChecked = function (id) {
-  const item = this.commandsMap[id];
-  if (!item) return false;
-  return item.getCheckStatus();
+  return this.commandsMap[id] ? this.commandsMap[id].checked : false;
 };

 Menu.prototype._isCommandIdEnabled = function (id) {
--- a/lib/browser/api/net.ts
+++ b/lib/browser/api/net.ts
@@ -197,7 +197,7 @@ class ChunkedBodyStream extends Writable {

 type RedirectPolicy = 'manual' | 'follow' | 'error';

-function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & { redirectPolicy: RedirectPolicy, headers: Record<string, { name: string, value: string | string[] }> } {
+function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & { redirectPolicy: RedirectPolicy, extraHeaders: Record<string, string> } {
  const options: any = typeof optionsIn === 'string' ? url.parse(optionsIn) : { ...optionsIn };

  let urlStr: string = options.url;
@@ -249,26 +249,22 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
    throw new TypeError('headers must be an object');
  }

-  const urlLoaderOptions: NodeJS.CreateURLLoaderOptions & { redirectPolicy: RedirectPolicy, headers: Record<string, { name: string, value: string | string[] }> } = {
+  const urlLoaderOptions: NodeJS.CreateURLLoaderOptions & { redirectPolicy: RedirectPolicy, extraHeaders: Record<string, string | string[]> } = {
    method: (options.method || 'GET').toUpperCase(),
    url: urlStr,
    redirectPolicy,
-    headers: {},
+    extraHeaders: options.headers || {},
    body: null as any,
    useSessionCookies: options.useSessionCookies,
-    credentials: options.credentials,
-    origin: options.origin
+    credentials: options.credentials
  };
-  const headers: Record<string, string | string[]> = options.headers || {};
-  for (const [name, value] of Object.entries(headers)) {
+  for (const [name, value] of Object.entries(urlLoaderOptions.extraHeaders!)) {
    if (!isValidHeaderName(name)) {
      throw new Error(`Invalid header name: '${name}'`);
    }
    if (!isValidHeaderValue(value.toString())) {
      throw new Error(`Invalid value for header '${name}': '${value}'`);
    }
-    const key = name.toLowerCase();
-    urlLoaderOptions.headers[key] = { name, value };
  }
  if (options.session) {
    // Weak check, but it should be enough to catch 99% of accidental misuses.
@@ -293,7 +289,7 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
  _aborted: boolean = false;
  _chunkedEncoding: boolean | undefined;
  _body: Writable | undefined;
-  _urlLoaderOptions: NodeJS.CreateURLLoaderOptions & { headers: Record<string, { name: string, value: string | string[] }> };
+  _urlLoaderOptions: NodeJS.CreateURLLoaderOptions & { extraHeaders: Record<string, string> };
  _redirectPolicy: RedirectPolicy;
  _followRedirectCb?: () => void;
  _uploadProgress?: { active: boolean, started: boolean, current: number, total: number };
@@ -354,7 +350,7 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
    }

    const key = name.toLowerCase();
-    this._urlLoaderOptions.headers[key] = { name, value };
+    this._urlLoaderOptions.extraHeaders[key] = value;
  }

  getHeader (name: string) {
@@ -363,8 +359,7 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
    }

    const key = name.toLowerCase();
-    const header = this._urlLoaderOptions.headers[key];
-    return header && header.value as any;
+    return this._urlLoaderOptions.extraHeaders[key];
  }

  removeHeader (name: string) {
@@ -377,7 +372,7 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {
    }

    const key = name.toLowerCase();
-    delete this._urlLoaderOptions.headers[key];
+    delete this._urlLoaderOptions.extraHeaders[key];
  }

  _write (chunk: Buffer, encoding: BufferEncoding, callback: () => void) {
@@ -406,20 +401,15 @@ export class ClientRequest extends Writable implements Electron.ClientRequest {

  _startRequest () {
    this._started = true;
-    const stringifyValues = (obj: Record<string, { name: string, value: string | string[] }>) => {
+    const stringifyValues = (obj: Record<string, any>) => {
      const ret: Record<string, string> = {};
      for (const k of Object.keys(obj)) {
-        const kv = obj[k];
-        ret[kv.name] = kv.value.toString();
+        ret[k] = obj[k].toString();
      }
      return ret;
    };
-    this._urlLoaderOptions.referrer = this.getHeader('referer') || '';
-    this._urlLoaderOptions.origin = this._urlLoaderOptions.origin || this.getHeader('origin') || '';
-    this._urlLoaderOptions.hasUserActivation = this.getHeader('sec-fetch-user') === '?1';
-    this._urlLoaderOptions.mode = this.getHeader('sec-fetch-mode') || '';
-    this._urlLoaderOptions.destination = this.getHeader('sec-fetch-dest') || '';
-    const opts = { ...this._urlLoaderOptions, extraHeaders: stringifyValues(this._urlLoaderOptions.headers) };
+    this._urlLoaderOptions.referrer = this._urlLoaderOptions.extraHeaders.referer || '';
+    const opts = { ...this._urlLoaderOptions, extraHeaders: stringifyValues(this._urlLoaderOptions.extraHeaders) };
    this._urlLoader = createURLLoader(opts);
    this._urlLoader.on('response-started', (event, finalUrl, responseHead) => {
      const response = this._response = new IncomingMessage(responseHead);
--- a/lib/browser/api/power-monitor.ts
+++ b/lib/browser/api/power-monitor.ts
@@ -4,8 +4,7 @@ import { app } from 'electron/main';
 const {
  createPowerMonitor,
  getSystemIdleState,
-  getSystemIdleTime,
-  isOnBatteryPower
+  getSystemIdleTime
 } = process._linkedBinding('electron_browser_power_monitor');

 class PowerMonitor extends EventEmitter {
@@ -46,14 +45,6 @@ class PowerMonitor extends EventEmitter {
  getSystemIdleTime () {
    return getSystemIdleTime();
  }
-
-  isOnBatteryPower () {
-    return isOnBatteryPower();
-  }
-
-  get onBatteryPower () {
-    return this.isOnBatteryPower();
-  }
 }

 module.exports = new PowerMonitor();
--- a/lib/browser/api/protocol.ts
+++ b/lib/browser/api/protocol.ts
@@ -17,12 +17,8 @@ Object.setPrototypeOf(protocol, new Proxy({}, {

  ownKeys () {
    if (!app.isReady()) return [];
-    return Reflect.ownKeys(session.defaultSession!.protocol);
-  },

-  has: (target, property: string) => {
-    if (!app.isReady()) return false;
-    return Reflect.has(session.defaultSession!.protocol, property);
+    return Object.getOwnPropertyNames(Object.getPrototypeOf(session.defaultSession!.protocol));
  },

  getOwnPropertyDescriptor () {
--- a/lib/browser/api/screen.ts
+++ b/lib/browser/api/screen.ts
@@ -1,47 +1,20 @@
-import { EventEmitter } from 'events';
 const { createScreen } = process._linkedBinding('electron_common_screen');

 let _screen: Electron.Screen;

-const createScreenIfNeeded = () => {
-  if (_screen === undefined) {
-    _screen = createScreen();
-  }
-};
-
 // We can't call createScreen until after app.on('ready'), but this module
 // exposes an instance created by createScreen. In order to avoid
 // side-effecting and calling createScreen upon import of this module, instead
 // we export a proxy which lazily calls createScreen on first access.
 export default new Proxy({}, {
-  get: (target, property: keyof Electron.Screen) => {
-    createScreenIfNeeded();
-    const value = _screen[property];
-    if (typeof value === 'function') {
-      return value.bind(_screen);
+  get: (target, prop: keyof Electron.Screen) => {
+    if (_screen === undefined) {
+      _screen = createScreen();
    }
-    return value;
-  },
-  set: (target, property: string, value: unknown) => {
-    createScreenIfNeeded();
-    return Reflect.set(_screen, property, value);
-  },
-  ownKeys: () => {
-    createScreenIfNeeded();
-    return Reflect.ownKeys(_screen);
-  },
-  has: (target, property: string) => {
-    createScreenIfNeeded();
-    return property in _screen;
-  },
-  getOwnPropertyDescriptor: (target, property: string) => {
-    createScreenIfNeeded();
-    return Reflect.getOwnPropertyDescriptor(_screen, property);
-  },
-  getPrototypeOf: () => {
-    // This is necessary as a result of weirdness with EventEmitterMixin
-    // and FunctionTemplate - we need to explicitly ensure it's returned
-    // in the prototype.
-    return EventEmitter.prototype;
+    const v = _screen[prop];
+    if (typeof v === 'function') {
+      return v.bind(_screen);
+    }
+    return v;
  }
 });
--- a/lib/browser/api/system-preferences.ts
+++ b/lib/browser/api/system-preferences.ts
@@ -11,7 +11,7 @@ if ('getAppLevelAppearance' in systemPreferences) {
 }

 if ('getEffectiveAppearance' in systemPreferences) {
-  const nativeEAGetter = systemPreferences.getEffectiveAppearance;
+  const nativeEAGetter = systemPreferences.getAppLevelAppearance;
  Object.defineProperty(systemPreferences, 'effectiveAppearance', {
    get: () => nativeEAGetter.call(systemPreferences)
  });
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -1,5 +1,5 @@
-import { app, ipcMain, session, deprecate, webFrameMain } from 'electron/main';
-import type { BrowserWindowConstructorOptions, MenuItem, MenuItemConstructorOptions, LoadURLOptions } from 'electron/main';
+import { app, ipcMain, session, deprecate, BrowserWindowConstructorOptions } from 'electron/main';
+import type { MenuItem, MenuItemConstructorOptions, LoadURLOptions } from 'electron/main';

 import * as url from 'url';
 import * as path from 'path';
@@ -123,43 +123,69 @@ const defaultPrintingSetting = {

 // JavaScript implementations of WebContents.
 const binding = process._linkedBinding('electron_browser_web_contents');
-const printing = process._linkedBinding('electron_browser_printing');
 const { WebContents } = binding as { WebContents: { prototype: Electron.WebContents } };

-WebContents.prototype.postMessage = function (...args) {
-  return this.mainFrame.postMessage(...args);
+WebContents.prototype.send = function (channel, ...args) {
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument');
+  }
+
+  const internal = false;
+  const sendToAll = false;
+
+  return this._send(internal, sendToAll, channel, args);
 };

-WebContents.prototype.send = function (channel, ...args) {
-  return this.mainFrame.send(channel, ...args);
+WebContents.prototype.postMessage = function (...args) {
+  if (Array.isArray(args[2])) {
+    args[2] = args[2].map(o => o instanceof MessagePortMain ? o._internalPort : o);
+  }
+  this._postMessage(...args);
 };

 WebContents.prototype._sendInternal = function (channel, ...args) {
-  return this.mainFrame._sendInternal(channel, ...args);
-};
-
-function getWebFrame (contents: Electron.WebContents, frame: number | [number, number]) {
-  if (typeof frame === 'number') {
-    return webFrameMain.fromId(contents.mainFrame.processId, frame);
-  } else if (Array.isArray(frame) && frame.length === 2 && frame.every(value => typeof value === 'number')) {
-    return webFrameMain.fromId(frame[0], frame[1]);
-  } else {
-    throw new Error('Missing required frame argument (must be number or [processId, frameId])');
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument');
  }
-}

-WebContents.prototype.sendToFrame = function (frameId, channel, ...args) {
-  const frame = getWebFrame(this, frameId);
-  if (!frame) return false;
-  frame.send(channel, ...args);
-  return true;
+  const internal = true;
+  const sendToAll = false;
+
+  return this._send(internal, sendToAll, channel, args);
 };
+WebContents.prototype._sendInternalToAll = function (channel, ...args) {
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument');
+  }

+  const internal = true;
+  const sendToAll = true;
+
+  return this._send(internal, sendToAll, channel, args);
+};
+WebContents.prototype.sendToFrame = function (frameId, channel, ...args) {
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument');
+  } else if (typeof frameId !== 'number') {
+    throw new Error('Missing required frameId argument');
+  }
+
+  const internal = false;
+  const sendToAll = false;
+
+  return this._sendToFrame(internal, sendToAll, frameId, channel, args);
+};
 WebContents.prototype._sendToFrameInternal = function (frameId, channel, ...args) {
-  const frame = getWebFrame(this, frameId);
-  if (!frame) return false;
-  frame._sendInternal(channel, ...args);
-  return true;
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument');
+  } else if (typeof frameId !== 'number') {
+    throw new Error('Missing required frameId argument');
+  }
+
+  const internal = true;
+  const sendToAll = false;
+
+  return this._sendToFrame(internal, sendToAll, frameId, channel, args);
 };

 // Following methods are mapped to webFrame.
@@ -172,7 +198,7 @@ const webFrameMethods = [

 for (const method of webFrameMethods) {
  WebContents.prototype[method] = function (...args: any[]): Promise<any> {
-    return ipcMainUtils.invokeInWebContents(this, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, method, ...args);
+    return ipcMainUtils.invokeInWebContents(this, false, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, method, ...args);
  };
 }

@@ -190,11 +216,11 @@ const waitTillCanExecuteJavaScript = async (webContents: Electron.WebContents) =
 // WebContents has been loaded.
 WebContents.prototype.executeJavaScript = async function (code, hasUserGesture) {
  await waitTillCanExecuteJavaScript(this);
-  return ipcMainUtils.invokeInWebContents(this, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, 'executeJavaScript', String(code), !!hasUserGesture);
+  return ipcMainUtils.invokeInWebContents(this, false, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, 'executeJavaScript', String(code), !!hasUserGesture);
 };
 WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId, code, hasUserGesture) {
  await waitTillCanExecuteJavaScript(this);
-  return ipcMainUtils.invokeInWebContents(this, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, 'executeJavaScriptInIsolatedWorld', worldId, code, !!hasUserGesture);
+  return ipcMainUtils.invokeInWebContents(this, false, IPC_MESSAGES.RENDERER_WEB_FRAME_METHOD, 'executeJavaScriptInIsolatedWorld', worldId, code, !!hasUserGesture);
 };

 // Translate the options of printToPDF.
@@ -390,10 +416,8 @@ WebContents.prototype.print = function (options = {}, callback) {
 };

 WebContents.prototype.getPrinters = function () {
-  // TODO(nornagon): this API has nothing to do with WebContents and should be
-  // moved.
-  if (printing.getPrinterList) {
-    return printing.getPrinterList();
+  if (this._getPrinters) {
+    return this._getPrinters();
  } else {
    console.error('Error: Printing feature is disabled.');
    return [];
@@ -451,9 +475,8 @@ WebContents.prototype._callWindowOpenHandler = function (event: any, url: string
 };

 const addReplyToEvent = (event: any) => {
-  const { processId, frameId } = event;
  event.reply = (...args: any[]) => {
-    event.sender.sendToFrame([processId, frameId], ...args);
+    event.sender.sendToFrame(event.frameId, ...args);
  };
 };

@@ -467,13 +490,6 @@ const addReplyInternalToEvent = (event: any) => {
  });
 };

-const addSenderFrameToEvent = (event: any) => {
-  const { processId, frameId } = event;
-  Object.defineProperty(event, 'senderFrame', {
-    get: () => webFrameMain.fromId(processId, frameId)
-  });
-};
-
 const addReturnValueToEvent = (event: any) => {
  Object.defineProperty(event, 'returnValue', {
    set: (value) => event.sendReply(value),
@@ -508,13 +524,6 @@ WebContents.prototype._init = function () {
  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;
-  Object.defineProperty(this, 'id', {
-    value: id,
-    writable: false
-  });

  this._windowOpenHandler = null;

@@ -524,7 +533,6 @@ WebContents.prototype._init = function () {

  // Dispatch IPC messages to the ipc module.
  this.on('-ipc-message' as any, function (this: Electron.WebContents, event: any, internal: boolean, channel: string, args: any[]) {
-    addSenderFrameToEvent(event);
    if (internal) {
      addReplyInternalToEvent(event);
      ipcMainInternal.emit(channel, event, ...args);
@@ -536,7 +544,6 @@ WebContents.prototype._init = function () {
  });

  this.on('-ipc-invoke' as any, function (event: any, internal: boolean, channel: string, args: any[]) {
-    addSenderFrameToEvent(event);
    event._reply = (result: any) => event.sendReply({ result });
    event._throw = (error: Error) => {
      console.error(`Error occurred in handler for '${channel}':`, error);
@@ -551,7 +558,6 @@ WebContents.prototype._init = function () {
  });

  this.on('-ipc-message-sync' as any, function (this: Electron.WebContents, event: any, internal: boolean, channel: string, args: any[]) {
-    addSenderFrameToEvent(event);
    addReturnValueToEvent(event);
    if (internal) {
      addReplyInternalToEvent(event);
@@ -568,6 +574,31 @@ WebContents.prototype._init = function () {
    ipcMain.emit(channel, event, message);
  });

+  const handleCustomErrorPageEvent = (eventName: string) => {
+    this.on(`-${eventName}` as any, function (this: any, event: any, ...args: any[]) {
+      let allowReturnValue = true;
+      Object.defineProperty(event, 'returnValue', {
+        set: (value) => {
+          if (!allowReturnValue) return;
+
+          if (typeof value !== 'object' || !value) { throw new TypeError(`event.returnValue must be set to a non-null object, was set to a "${typeof value}"`); }
+          if (typeof value.errorCode !== 'number') { throw new TypeError(`event.returnValue.errorCode must be set to a number, was set to a "${typeof value.errorCode}"`); }
+          if (value.errorCode >= 0) { throw new TypeError(`event.returnValue.errorCode must be negative, was set to "${value.errorCode}"`); }
+          if (value.errorPage && typeof value.errorPage !== 'string') { throw new TypeError(`event.returnValue.errorPage must be set to a string if provided, was set to a "${typeof value.errorPage}"`); }
+          if (typeof value.errorPage === 'string' && value.errorPage.length === 0) { throw new Error('event.returnValue.errorPage must be a non-empty string, an empty string was provided'); }
+          if (value.errorPage && value.errorCode === -3) { throw new Error('event.returnValue.errorCode can not be set to "-2" when an errorPage is provided'); }
+          event.preventDefault();
+          event.sendReply(value);
+        },
+        get: () => {}
+      });
+      this.emit(eventName, event, ...args);
+      allowReturnValue = false;
+    });
+  };
+  handleCustomErrorPageEvent('will-navigate');
+  handleCustomErrorPageEvent('will-fail-load');
+
  // Handle context menu action request from pepper plugin.
  this.on('pepper-context-menu' as any, function (event: any, params: {x: number, y: number, menu: Array<(MenuItemConstructorOptions) | (MenuItem)>}, callback: () => void) {
    // Access Menu via electron.Menu to prevent circular require.
@@ -720,8 +751,8 @@ WebContents.prototype._init = function () {
 };

 // Public APIs.
-export function create (options = {}): Electron.WebContents {
-  return new (WebContents as any)(options);
+export function create (options = {}) {
+  return binding.create(options);
 }

 export function fromId (id: string) {
--- a/lib/browser/api/web-frame-main.ts
+++ b/lib/browser/api/web-frame-main.ts
@@ -1,29 +1,4 @@
-import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-
-const { WebFrameMain, fromId } = process._linkedBinding('electron_browser_web_frame_main');
-
-WebFrameMain.prototype.send = function (channel, ...args) {
-  if (typeof channel !== 'string') {
-    throw new Error('Missing required channel argument');
-  }
-
-  return this._send(false /* internal */, channel, args);
-};
-
-WebFrameMain.prototype._sendInternal = function (channel, ...args) {
-  if (typeof channel !== 'string') {
-    throw new Error('Missing required channel argument');
-  }
-
-  return this._send(true /* internal */, channel, args);
-};
-
-WebFrameMain.prototype.postMessage = function (...args) {
-  if (Array.isArray(args[2])) {
-    args[2] = args[2].map(o => o instanceof MessagePortMain ? o._internalPort : o);
-  }
-  this._postMessage(...args);
-};
+const { fromId } = process._linkedBinding('electron_browser_web_frame_main');

 export default {
  fromId
--- a/lib/browser/desktop-capturer.ts
+++ b/lib/browser/desktop-capturer.ts
@@ -48,9 +48,6 @@ export const getSourcesImpl = (event: Electron.IpcMainEvent | null, args: Electr
      }
      // Remove from currentlyRunning once we resolve or reject
      currentlyRunning = currentlyRunning.filter(running => running.options !== options);
-      if (event) {
-        event.sender.removeListener('destroyed', stopRunning);
-      }
    };

    capturer._onerror = (error: string) => {
@@ -69,7 +66,7 @@ export const getSourcesImpl = (event: Electron.IpcMainEvent | null, args: Electr
    // reference to emit and the capturer itself so that it never dispatches
    // back to the renderer
    if (event) {
-      event.sender.once('destroyed', stopRunning);
+      event.sender.once('destroyed', () => stopRunning());
    }
  });

--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -47,7 +47,6 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
    embedder,
    features,
    frameName,
-    isNativeWindowOpen,
    overrideOptions: overrideBrowserWindowOptions
  });

@@ -200,11 +199,10 @@ const securityWebPreferences: { [key: string]: boolean } = {
  enableWebSQL: false
 };

-function makeBrowserWindowOptions ({ embedder, features, frameName, isNativeWindowOpen, overrideOptions, useDeprecatedBehaviorForBareValues = true, useDeprecatedBehaviorForOptionInheritance = true }: {
+function makeBrowserWindowOptions ({ embedder, features, frameName, overrideOptions, useDeprecatedBehaviorForBareValues = true, useDeprecatedBehaviorForOptionInheritance = true }: {
  embedder: WebContents,
  features: string,
  frameName: string,
-  isNativeWindowOpen: boolean,
  overrideOptions?: BrowserWindowConstructorOptions,
  useDeprecatedBehaviorForBareValues?: boolean
  useDeprecatedBehaviorForOptionInheritance?: boolean
@@ -218,9 +216,9 @@ function makeBrowserWindowOptions ({ embedder, features, frameName, isNativeWind
    options: {
      ...(useDeprecatedBehaviorForOptionInheritance && deprecatedInheritedOptions),
      show: true,
+      title: frameName,
      width: 800,
      height: 600,
-      ...(!isNativeWindowOpen && { title: frameName }),
      ...parsedOptions,
      ...overrideOptions,
      webPreferences: makeWebPreferences({ embedder, insecureParsedWebPreferences: parsedWebPreferences, secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences, useDeprecatedBehaviorForOptionInheritance: true })
--- a/lib/browser/init.ts
+++ b/lib/browser/init.ts
@@ -145,9 +145,6 @@ require('@electron/internal/browser/api/protocol');
 // Load web-contents module to ensure it is populated on app ready
 require('@electron/internal/browser/api/web-contents');

-// Load web-frame-main module to ensure it is populated on app ready
-require('@electron/internal/browser/api/web-frame-main');
-
 // Set main startup script of the app.
 const mainStartupScript = packageJson.main || 'index.js';

--- a/lib/browser/ipc-main-internal-utils.ts
+++ b/lib/browser/ipc-main-internal-utils.ts
@@ -14,7 +14,7 @@ export const handleSync = function <T extends IPCHandler> (channel: string, hand

 let nextId = 0;

-export function invokeInWebContents<T> (sender: Electron.WebContents, command: string, ...args: any[]) {
+export function invokeInWebContents<T> (sender: Electron.WebContents, sendToAll: boolean, command: string, ...args: any[]) {
  return new Promise<T>((resolve, reject) => {
    const requestId = ++nextId;
    const channel = `${command}_RESPONSE_${requestId}`;
@@ -33,6 +33,10 @@ export function invokeInWebContents<T> (sender: Electron.WebContents, command: s
      }
    });

-    sender._sendInternal(command, requestId, ...args);
+    if (sendToAll) {
+      sender._sendInternalToAll(command, requestId, ...args);
+    } else {
+      sender._sendInternal(command, requestId, ...args);
+    }
  });
 }
--- a/lib/browser/remote/server.ts
+++ b/lib/browser/remote/server.ts
@@ -20,7 +20,7 @@ const FUNCTION_PROPERTIES = [
 ];

 type RendererFunctionId = [string, number] // [contextId, funcId]
-type FinalizerInfo = { id: RendererFunctionId, webContents: electron.WebContents, frameId: [number, number] };
+type FinalizerInfo = { id: RendererFunctionId, webContents: electron.WebContents, frameId: number };
 type CallIntoRenderer = (...args: any[]) => void

 // The remote functions in renderer processes.
@@ -31,7 +31,7 @@ const finalizationRegistry = new FinalizationRegistry((fi: FinalizerInfo) => {
  const ref = rendererFunctionCache.get(mapKey);
  if (ref !== undefined && ref.deref() === undefined) {
    rendererFunctionCache.delete(mapKey);
-    if (!fi.webContents.isDestroyed()) { fi.webContents._sendToFrameInternal(fi.frameId, IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, fi.id[0], fi.id[1]); }
+    if (!fi.webContents.isDestroyed()) { fi.webContents.sendToFrame(fi.frameId, IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, fi.id[0], fi.id[1]); }
  }
 });

@@ -43,7 +43,7 @@ function getCachedRendererFunction (id: RendererFunctionId): CallIntoRenderer |
    if (deref !== undefined) return deref;
  }
 }
-function setCachedRendererFunction (id: RendererFunctionId, wc: electron.WebContents, frameId: [number, number], value: CallIntoRenderer) {
+function setCachedRendererFunction (id: RendererFunctionId, wc: electron.WebContents, frameId: number, value: CallIntoRenderer) {
  // eslint-disable-next-line no-undef
  const wr = new WeakRef<CallIntoRenderer>(value);
  const mapKey = id[0] + '~' + id[1];
@@ -218,7 +218,7 @@ const fakeConstructor = (constructor: Function, name: string) =>
  });

 // 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 unwrapArgs = function (sender: electron.WebContents, frameId: number, contextId: string, args: any[]) {
  const metaToValue = function (meta: MetaTypeFromRenderer): any {
    switch (meta.type) {
      case 'nativeimage':
@@ -421,7 +421,7 @@ handleRemoteCommand(IPC_MESSAGES.BROWSER_GET_CURRENT_WEB_CONTENTS, function (eve
 });

 handleRemoteCommand(IPC_MESSAGES.BROWSER_CONSTRUCTOR, function (event, contextId, id, args) {
-  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  args = unwrapArgs(event.sender, event.frameId, contextId, args);
  const constructor = objectsRegistry.get(id);

  if (constructor == null) {
@@ -432,7 +432,7 @@ handleRemoteCommand(IPC_MESSAGES.BROWSER_CONSTRUCTOR, function (event, contextId
 });

 handleRemoteCommand(IPC_MESSAGES.BROWSER_FUNCTION_CALL, function (event, contextId, id, args) {
-  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  args = unwrapArgs(event.sender, event.frameId, contextId, args);
  const func = objectsRegistry.get(id);

  if (func == null) {
@@ -449,7 +449,7 @@ handleRemoteCommand(IPC_MESSAGES.BROWSER_FUNCTION_CALL, function (event, context
 });

 handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CONSTRUCTOR, function (event, contextId, id, method, args) {
-  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  args = unwrapArgs(event.sender, event.frameId, contextId, args);
  const object = objectsRegistry.get(id);

  if (object == null) {
@@ -460,7 +460,7 @@ handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CONSTRUCTOR, function (event, co
 });

 handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CALL, function (event, contextId, id, method, args) {
-  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  args = unwrapArgs(event.sender, event.frameId, contextId, args);
  const object = objectsRegistry.get(id);

  if (object == null) {
@@ -477,7 +477,7 @@ handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_CALL, function (event, contextId
 });

 handleRemoteCommand(IPC_MESSAGES.BROWSER_MEMBER_SET, function (event, contextId, id, name, args) {
-  args = unwrapArgs(event.sender, [event.processId, event.frameId], contextId, args);
+  args = unwrapArgs(event.sender, event.frameId, contextId, args);
  const obj = objectsRegistry.get(id);

  if (obj == null) {
--- a/lib/browser/rpc-server.ts
+++ b/lib/browser/rpc-server.ts
@@ -1,6 +1,6 @@
 import { app } from 'electron/main';
 import type { WebContents } from 'electron/main';
-import { clipboard, nativeImage } from 'electron/common';
+import { clipboard, crashReporter, nativeImage } from 'electron/common';
 import * as fs from 'fs';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
@@ -82,7 +82,7 @@ const getPreloadScript = async function (preloadPath: string) {
  let preloadSrc = null;
  let preloadError = null;
  try {
-    preloadSrc = await fs.promises.readFile(preloadPath, 'utf8');
+    preloadSrc = (await fs.promises.readFile(preloadPath)).toString();
  } catch (error) {
    preloadError = error;
  }
@@ -114,6 +114,26 @@ ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadP
  event.sender.emit('preload-error', event, preloadPath, error);
 });

+ipcMainUtils.handleSync(IPC_MESSAGES.CRASH_REPORTER_GET_LAST_CRASH_REPORT, () => {
+  return crashReporter.getLastCrashReport();
+});
+
+ipcMainUtils.handleSync(IPC_MESSAGES.CRASH_REPORTER_GET_UPLOADED_REPORTS, () => {
+  return crashReporter.getUploadedReports();
+});
+
+ipcMainUtils.handleSync(IPC_MESSAGES.CRASH_REPORTER_GET_UPLOAD_TO_SERVER, () => {
+  return crashReporter.getUploadToServer();
+});
+
+ipcMainUtils.handleSync(IPC_MESSAGES.CRASH_REPORTER_SET_UPLOAD_TO_SERVER, (event, uploadToServer: boolean) => {
+  return crashReporter.setUploadToServer(uploadToServer);
+});
+
+ipcMainUtils.handleSync(IPC_MESSAGES.CRASH_REPORTER_GET_CRASHES_DIRECTORY, () => {
+  return crashReporter.getCrashesDirectory();
+});
+
 ipcMainInternal.handle(IPC_MESSAGES.NATIVE_IMAGE_CREATE_THUMBNAIL_FROM_PATH, async (_, path: string, size: Electron.Size) => {
  return typeUtils.serialize(await nativeImage.createThumbnailFromPath(path, size));
 });
--- a/lib/common/ipc-messages.ts
+++ b/lib/common/ipc-messages.ts
@@ -5,6 +5,12 @@ export const enum IPC_MESSAGES {
  BROWSER_SANDBOX_LOAD = 'BROWSER_SANDBOX_LOAD',
  BROWSER_WINDOW_CLOSE = 'BROWSER_WINDOW_CLOSE',

+  CRASH_REPORTER_GET_LAST_CRASH_REPORT = 'CRASH_REPORTER_GET_LAST_CRASH_REPORT',
+  CRASH_REPORTER_GET_UPLOADED_REPORTS = 'CRASH_REPORTER_GET_UPLOADED_REPORTS',
+  CRASH_REPORTER_GET_UPLOAD_TO_SERVER = 'CRASH_REPORTER_GET_UPLOAD_TO_SERVER',
+  CRASH_REPORTER_SET_UPLOAD_TO_SERVER = 'CRASH_REPORTER_SET_UPLOAD_TO_SERVER',
+  CRASH_REPORTER_GET_CRASHES_DIRECTORY = 'CRASH_REPORTER_GET_CRASHES_DIRECTORY',
+
  GUEST_INSTANCE_VISIBILITY_CHANGE = 'GUEST_INSTANCE_VISIBILITY_CHANGE',

  GUEST_VIEW_INTERNAL_DESTROY_GUEST = 'GUEST_VIEW_INTERNAL_DESTROY_GUEST',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Samuel Attard	77189f7a39	chore: fix lint	2020-11-10 14:07:04 -08:00
Samuel Attard	28b794216d	fixup tests	2020-11-10 14:03:02 -08:00
Samuel Attard	58d9c451c6	chore: fixup linting	2020-11-10 14:03:00 -08:00
Samuel Attard	71d8a4a466	chore: fixup docs	2020-11-10 14:02:22 -08:00
Samuel Attard	825f3a3a7d	chore: fixup for review	2020-11-10 14:02:22 -08:00
Samuel Attard	b2625db2ba	feat: add support for will-navigate and will-fail-load custom error pages	2020-11-10 14:02:20 -08:00