Bump v11.2.3

chore: cherry-pick 36abafa0a316 from v8 (#27624 )
fix: cherry-pick 5c7ad5393f74 from chromium (#27584 )
2026-02-26 03:01:17 -05:00 · 2021-02-05 10:09:13 -08:00 · 2021-02-05 09:43:20 -08:00 · 2021-02-03 20:47:35 -08:00 · 2021-02-03 16:28:28 +09:00 · 2021-02-02 09:38:53 -08:00
436 changed files with 14405 additions and 3194 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electronjs/build:d09fd95029bd8c1c73069888231b29688ef385ed
+    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
@@ -107,6 +107,7 @@ env-release-build: &env-release-build
  STRIP_BINARIES: true
  GENERATE_SYMBOLS: true
  CHECK_DIST_MANIFEST: '1'
+  IS_RELEASE: true

 env-headless-testing: &env-headless-testing
  DISPLAY: ':99.0'
@@ -256,23 +257,34 @@ step-gclient-sync: &step-gclient-sync
          "$CIRCLE_REPOSITORY_URL"

        ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
-        # Re-export all the patches to check if there were changes.
-        python src/electron/script/export_all_patches.py src/electron/patches/config.json
-        cd src/electron
-        git update-index --refresh || true
-        if ! git diff-index --quiet HEAD --; then
-          # There are changes to the patches. Make a git commit with the updated patches
-          git add patches
-          GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="anonymous@electronjs.org" git commit -m "update patches" --author="Electron Bot <anonymous@electronjs.org>"
-          # Export it
-          mkdir -p ../../patches
-          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          echo
-          echo "======================================================================"
-          echo "There were changes to the patches when applying."
-          echo "Check the CI artifacts for a patch you can apply to fix it."
-          echo "======================================================================"
-          exit 1
+        if [ "$IS_RELEASE" != "true" ]; then
+          # Re-export all the patches to check if there were changes.
+          python src/electron/script/export_all_patches.py src/electron/patches/config.json
+          cd src/electron
+          git update-index --refresh || true
+          if ! git diff-index --quiet HEAD --; then
+            # There are changes to the patches. Make a git commit with the updated patches
+            git add patches
+            GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="electron@github.com" git commit -m "update patches" --author="Electron Bot <electron@github.com>"
+            # Export it
+            mkdir -p ../../patches
+            git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
+            if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
+              echo
+              echo "======================================================================"
+              echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
+              echo "A new CI job will kick off shortly"
+              echo "======================================================================"
+              exit 1
+            else
+              echo
+              echo "======================================================================"
+              echo "There were changes to the patches when applying."
+              echo "Check the CI artifacts for a patch you can apply to fix it."
+              echo "======================================================================"
+              exit 1
+            fi
+          fi
        fi
      fi

@@ -299,10 +311,10 @@ step-setup-goma-for-build: &step-setup-goma-for-build
    name: Setup Goma
    command: |
      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
+      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
      fi
      if [ ! -z "$RAW_GOMA_AUTH" ]; then
        echo $RAW_GOMA_AUTH > ~/.goma_oauth2_config
@@ -311,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()"
+      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
      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
@@ -320,15 +332,17 @@ step-setup-goma-for-build: &step-setup-goma-for-build
 step-restore-brew-cache: &step-restore-brew-cache
  restore_cache:
    paths:
-      - /usr/local/Homebrew
+      - /usr/local/Cellar/gnu-tar
+      - /usr/local/bin/gtar
    keys:
-      - v1-brew-cache-{{ arch }}
+      - v4-brew-cache-{{ arch }}

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

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

@@ -572,6 +588,9 @@ step-electron-dist-build: &step-electron-dist-build
            if [ x"$MAS_BUILD" == x"true" ]; then
              target_os=mac_mas
            fi
+            if [ "$TARGET_ARCH" == "arm64" ]; then
+              target_cpu=arm64
+            fi
          elif [ "`uname`" == "Linux" ]; then
            target_os=linux
            if [ x"$TARGET_ARCH" == x ]; then
@@ -659,10 +678,10 @@ step-electron-publish: &step-electron-publish
      cd src/electron
      if [ "$UPLOAD_TO_S3" == "1" ]; then
        echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --upload_to_s3
+        script/release/uploaders/upload.py --verbose --upload_to_s3
      else
        echo 'Uploading Electron release distribution to Github releases'
-        script/release/uploaders/upload.py
+        script/release/uploaders/upload.py --verbose
      fi

 step-persist-data-for-tests: &step-persist-data-for-tests
@@ -764,14 +783,20 @@ step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing

 step-show-sccache-stats: &step-show-sccache-stats
  run:
+    shell: /bin/bash
    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
  run:
@@ -909,6 +934,8 @@ 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
@@ -1135,7 +1162,6 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
    - *step-maybe-early-exit-doc-only-change
    - *step-depot-tools-get
    - *step-depot-tools-add-to-path
-    - *step-restore-brew-cache
    - *step-get-more-space-on-mac
    - *step-install-gnutar-on-mac

@@ -1799,7 +1825,7 @@ jobs:

  # Layer 2: Builds.
  linux-x64-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
    environment:
      <<: *env-global
      <<: *env-testing-build
@@ -1879,7 +1905,7 @@ jobs:
          checkout: false

  linux-ia32-testing:
-    <<: *machine-linux-xlarge
+    <<: *machine-linux-2xlarge
    environment:
      <<: *env-global
      <<: *env-ia32
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -325,7 +325,6 @@ source_set("electron_lib") {
    "//base/allocator:buildflags",
    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
-    "//chrome/services/printing/public/mojom",
    "//components/certificate_transparency",
    "//components/language/core/browser",
    "//components/net_log",
@@ -372,6 +371,7 @@ source_set("electron_lib") {
    "//third_party/libyuv",
    "//third_party/webrtc_overrides:webrtc_component",
    "//third_party/widevine/cdm:headers",
+    "//third_party/zlib/google:zip",
    "//ui/base/idle",
    "//ui/events:dom_keycode_converter",
    "//ui/gl",
@@ -405,44 +405,26 @@ source_set("electron_lib") {
    defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
  }

-  extra_source_filters = []
-  if (!is_linux) {
-    extra_source_filters += [
-      "*\bx/*",
-      "*_x11.h",
-      "*_x11.cc",
-      "*_gtk.h",
-      "*_gtk.cc",
-      "*\blibrary_loaders/*",
-    ]
-  }
-  if (!is_win) {
-    extra_source_filters += [
-      "*\bwin_*.h",
-      "*\bwin_*.cc",
-    ]
-  }
-  if (!is_posix) {
-    extra_source_filters += [
-      "*_posix.cc",
-      "*_posix.h",
-    ]
-  }
-  if (is_mac) {
-    extra_source_filters += [
-      "*_views.cc",
-      "*_views.h",
-      "*\bviews/*",
-    ]
-  }
  if (!is_mas_build) {
    deps += [ "//components/crash/core/app" ]
  }

-  set_sources_assignment_filter(
-      sources_assignment_filter + extra_source_filters)
  sources = filenames.lib_sources
-  set_sources_assignment_filter(sources_assignment_filter)
+  if (is_win) {
+    sources += filenames.lib_sources_win
+  }
+  if (is_mac) {
+    sources += filenames.lib_sources_mac
+  }
+  if (is_posix) {
+    sources += filenames.lib_sources_posix
+  }
+  if (is_linux) {
+    sources += filenames.lib_sources_linux
+  }
+  if (!is_mac) {
+    sources += filenames.lib_sources_views
+  }

  if (is_component_build) {
    defines += [ "NODE_SHARED_MODE" ]
@@ -531,7 +513,9 @@ source_set("electron_lib") {
      ]
    }
    configs += [ ":gio_unix" ]
-    configs += [ "//build/config/linux:x11" ]
+    if (use_x11) {
+      deps += [ "//ui/gfx/x" ]
+    }
    defines += [
      # Disable warnings for g_settings_list_schemas.
      "GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -587,7 +571,6 @@ source_set("electron_lib") {
    sources += [
      "shell/browser/osr/osr_host_display_client.cc",
      "shell/browser/osr/osr_host_display_client.h",
-      "shell/browser/osr/osr_host_display_client_mac.mm",
      "shell/browser/osr/osr_render_widget_host_view.cc",
      "shell/browser/osr/osr_render_widget_host_view.h",
      "shell/browser/osr/osr_video_consumer.cc",
@@ -596,8 +579,13 @@ source_set("electron_lib") {
      "shell/browser/osr/osr_view_proxy.h",
      "shell/browser/osr/osr_web_contents_view.cc",
      "shell/browser/osr/osr_web_contents_view.h",
-      "shell/browser/osr/osr_web_contents_view_mac.mm",
    ]
+    if (is_mac) {
+      sources += [
+        "shell/browser/osr/osr_host_display_client_mac.mm",
+        "shell/browser/osr/osr_web_contents_view_mac.mm",
+      ]
+    }
    deps += [
      "//components/viz/service",
      "//services/viz/public/mojom",
@@ -632,7 +620,10 @@ source_set("electron_lib") {
      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
      "shell/renderer/printing/print_render_frame_helper_delegate.h",
    ]
-    deps += [ "//components/printing/common:mojo_interfaces" ]
+    deps += [
+      "//chrome/services/printing/public/mojom",
+      "//components/printing/common:mojo_interfaces",
+    ]
  }

  if (enable_electron_extensions) {
@@ -670,6 +661,14 @@ source_set("electron_lib") {
      "shell/browser/electron_pdf_web_contents_helper_client.h",
    ]
  }
+
+  if (is_win && enable_win_dark_mode_window_ui) {
+    sources += [
+      "shell/browser/win/dark_mode.cc",
+      "shell/browser/win/dark_mode.h",
+    ]
+    libs += [ "uxtheme.lib" ]
+  }
 }

 electron_paks("packed_resources") {
@@ -695,10 +694,10 @@ if (is_mac) {
  action("fake_v8_context_snapshot_generator") {
    script = "build/fake_v8_context_snapshot_generator.py"
    args = [
-      rebase_path("$root_out_dir/v8_context_snapshot.bin"),
-      rebase_path("$root_out_dir/fake/v8_context_snapshot.bin"),
+      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
+      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
    ]
-    outputs = [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
+    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
  }

  bundle_data("electron_framework_resources") {
@@ -712,10 +711,10 @@ if (is_mac) {
      public_deps += [ "//v8" ]
      if (use_v8_context_snapshot) {
        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
+          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
          public_deps += [ ":fake_v8_context_snapshot_generator" ]
        } else {
-          sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
          public_deps += [ "//tools/v8_context_snapshot" ]
        }
      } else {
@@ -1156,6 +1155,19 @@ 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/4
+++ b/4
@@ -14,13 +14,13 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '87.0.4251.1',
+    '87.0.4280.141',
  'node_version':
    'v12.18.3',
  'nan_version':
    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
  'squirrel.mac_version':
-    '44468f858ce0d25c27bd5e674abfa104e0119738',
+    'a3a5b3f03b824441c014893b18f99a103b2603e9',

  'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
  'pyyaml_version': '3.12',
--- a/2
+++ b/2
@@ -1 +1 @@
-11.0.0-beta.8
+11.2.3
--- a/README.md
+++ b/README.md
@@ -28,15 +28,12 @@ The preferred method is to install Electron as a development dependency in your
 app:

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

-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).
+[installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
+[Electron versioning](docs/tutorial/electron-versioning.md).

 ## Quick start & Electron Fiddle

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -53,7 +53,9 @@ build_script:
      } else {
        node script/yarn.js install --frozen-lockfile

-        if ($(node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH;$LASTEXITCODE -eq 0)) {
+        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
+        Write-Output $result
+        if ($result.ExitCode -eq 0) {
          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
        }
      }
@@ -99,6 +101,11 @@ build_script:
          } else {
            # update external binaries
            python src/electron/script/update-external-binaries.py
+            # update angle
+            cd src\third_party\angle
+            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+            git fetch
+            cd ..\..\..
          }
        } else {    
          # file does not exist, gclient sync, then zip
@@ -114,14 +121,16 @@ build_script:
      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
        # archive current source for future use 
        # only run on x64/woa to avoid contention saving
-        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
+        $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
+        if ($LASTEXITCODE -ne 0) {
          Write-warning "Could not save source to shared drive; continuing anyway"
        }
-        # build time generation of file gen/angle/commit.h depends on
-        # third_party/angle/.git/HEAD.
+        # build time generation of file gen/angle/angle_commit.h depends on
+        # third_party/angle/.git
        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-        if ($(7z a $zipfile src\third_party\angle\.git\HEAD;$LASTEXITCODE -ne 0)) {
-          Write-warning "Failed to add third_party\angle\.git\HEAD; continuing anyway"
+        $(7z a $zipfile src\third_party\angle\.git)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
        }
      }
  - ps: >-
@@ -134,7 +143,7 @@ build_script:
        cd build-tools
        npm install
        mkdir third_party
-        node -e "require('./src/utils/goma.js').downloadAndPrepare()"
+        node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
        $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
        $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
        cd ..
@@ -205,7 +214,8 @@ test_script:
        echo "Skipping tests for $env:GN_CONFIG build"
      }
  - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging)
+  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
  - cd ..
  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
  - echo "About to verify mksnapshot"
@@ -219,10 +229,10 @@ deploy_script:
      if (Test-Path Env:\ELECTRON_RELEASE) {
        if (Test-Path Env:\UPLOAD_TO_S3) {
          Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --upload_to_s3
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
        } else {
          Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py
+          & python script\release\uploaders\upload.py --verbose
        }
      } elseif (Test-Path Env:\TEST_WOA) {
        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -63,7 +63,8 @@ steps:
    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
    set npm_config_arch=arm64
    cd electron
-    node script/yarn test -- --enable-logging --verbose
+    # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
+    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
  displayName: 'Run Electron tests'
  env:
    ELECTRON_OUT_DIR: Default
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 82
+node_module_version = 85

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
--- a/build/zip.py
+++ b/build/zip.py
@@ -13,27 +13,30 @@ EXTENSIONS_TO_SKIP = [
 ]

 PATHS_TO_SKIP = [
-  'angledata', #Skipping because it is an output of //ui/gl that we don't need
-  './libVkICD_mock_', #Skipping because these are outputs that we don't need
-  './VkICD_mock_', #Skipping because these are outputs that we don't need
-
-  # Skipping because its an output of create_bundle from //build/config/mac/rules.gni
+  # Skip because it is an output of //ui/gl that we don't need.
+  'angledata',
+  # Skip because these are outputs that we don't need.
+  './libVkICD_mock_',
+  # Skip because these are outputs that we don't need.
+  './VkICD_mock_',
+  # Skip because its an output of create_bundle from //build/config/mac/rules.gni
  # that we don't need
  'Electron.dSYM',
-
+  # Refs https://chromium-review.googlesource.com/c/angle/angle/+/2425197.
+  # Remove this when Angle themselves remove the file: https://issuetracker.google.com/issues/168736059
+  'gen/angle/angle_commit.h',
  # //chrome/browser:resources depends on this via
  # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
  # ship it.
  'pyproto',
-
  # On Windows, this binary doesn't exist (the crashpad handler is built-in).
  # On MacOS, the binary is called 'chrome_crashpad_handler' and is inside the
  # app bundle.
  # On Linux, we don't use crashpad, but this binary is still built for some
  # reason. Exclude it from the zip.
  './crashpad_handler',
-
-  'resources/inspector', #Skipping because these are outputs that we don't need
+  # Skip because these are outputs that we don't need.
+  'resources/inspector',
 ]

 def skip_path(dep, dist_zip, target_cpu):
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -21,6 +21,7 @@ buildflag_header("buildflags") {
    "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
+    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
    "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
  ]
 }
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -36,4 +36,7 @@ declare_args() {

  # Enable Spellchecker support
  enable_builtin_spellchecker = true
+
+  # Undocumented Windows dark mode API
+  enable_win_dark_mode_window_ui = false
 }
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -26,18 +26,10 @@ static_library("chrome") {
    "//chrome/browser/devtools/devtools_file_system_indexer.h",
    "//chrome/browser/extensions/global_shortcut_listener.cc",
    "//chrome/browser/extensions/global_shortcut_listener.h",
-    "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-    "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-    "//chrome/browser/extensions/global_shortcut_listener_win.cc",
-    "//chrome/browser/extensions/global_shortcut_listener_win.h",
    "//chrome/browser/icon_loader.cc",
    "//chrome/browser/icon_loader.h",
-    "//chrome/browser/icon_loader_mac.mm",
-    "//chrome/browser/icon_loader_win.cc",
    "//chrome/browser/icon_manager.cc",
    "//chrome/browser/icon_manager.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
    "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
    "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
    "//chrome/browser/net/proxy_config_monitor.cc",
@@ -57,14 +49,32 @@ static_library("chrome") {
    "//chrome/browser/ssl/tls_deprecation_config.cc",
    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
-    "//chrome/browser/win/chrome_process_finder.cc",
-    "//chrome/browser/win/chrome_process_finder.h",
-    "//chrome/child/v8_crashpad_support_win.cc",
-    "//chrome/child/v8_crashpad_support_win.h",
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
  ]

+  if (is_mac) {
+    sources += [
+      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+      "//chrome/browser/icon_loader_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+    ]
+  }
+
+  if (is_win) {
+    sources += [
+      "//chrome/browser/extensions/global_shortcut_listener_win.cc",
+      "//chrome/browser/extensions/global_shortcut_listener_win.h",
+      "//chrome/browser/icon_loader_win.cc",
+      "//chrome/browser/win/chrome_process_finder.cc",
+      "//chrome/browser/win/chrome_process_finder.h",
+      "//chrome/child/v8_crashpad_support_win.cc",
+      "//chrome/child/v8_crashpad_support_win.h",
+    ]
+  }
+
  public_deps = [
    "//chrome/common",
    "//chrome/common:version_header",
@@ -124,10 +134,17 @@ 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" ]
+      sources += [
+        "//chrome/browser/platform_util_aura.cc",
+        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
+      ]

      if (!is_win) {
        sources += [
@@ -144,6 +161,8 @@ 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",
@@ -266,6 +285,17 @@ 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" ]
+    }
+  }
 }

 source_set("plugins") {
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -826,10 +826,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
  to_send.append(current_dir.value());

  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-  for (std::vector<std::string>::const_iterator it = argv.begin();
-       it != argv.end(); ++it) {
+  for (const auto& arg : argv) {
    to_send.push_back(kTokenDelimiter);
-    to_send.append(*it);
+    to_send.append(arg);
  }

  // Send the message
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
@@ -122,8 +122,7 @@ void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
                                                   GParamSpec* /* ignored */) {
  // If the name owner changed, we need to reregister all the live x11::Window
  // with the system.
-  for (std::set<x11::Window>::const_iterator it = live_windows_.begin();
-       it != live_windows_.end(); ++it) {
-    RegisterXWindow(*it);
+  for (const auto& window : live_windows_) {
+    RegisterXWindow(window);
  }
 }
--- a/docs/README.md
+++ b/docs/README.md
@@ -148,6 +148,7 @@ 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
@@ -32,7 +32,8 @@ In most cases, you should do everything in the `ready` event handler.

 Returns:

-* `launchInfo` unknown _macOS_
+* `event` Event
+* `launchInfo` Record<string, any> _macOS_

 Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
 holds the `userInfo` of the `NSUserNotification` that was used to open the
@@ -402,7 +403,7 @@ Returns:
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
    * `crashed` - Process crashed
    * `oom` - Process ran out of memory
-    * `launch-failure` - Process never successfully launched
+    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed

 Emitted when the renderer process unexpectedly disappears.  This is normally
@@ -428,7 +429,7 @@ Returns:
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
    * `crashed` - Process crashed
    * `oom` - Process ran out of memory
-    * `launch-failure` - Process never successfully launched
+    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
  * `exitCode` Number - The exit code for the process
      (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
@@ -1340,7 +1341,7 @@ systems Application folder. Use in combination with `app.moveToApplicationsFolde
 ### `app.moveToApplicationsFolder([options])` _macOS_

 * `options` Object (optional)
-  * `conflictHandler` Function<Boolean> (optional) - A handler for potential conflict in move failure.
+  * `conflictHandler` Function\<Boolean> (optional) - A handler for potential conflict in move failure.
    * `conflictType` String - The type of move conflict encountered by the handler; can be `exists` or `existsAndRunning`, where `exists` means that an app of the same name is present in the Applications directory and `existsAndRunning` means both that it exists and that it's presently running.

 Returns `Boolean` - Whether the move was successful. Please note that if
@@ -1484,3 +1485,12 @@ 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
@@ -541,6 +541,12 @@ 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:
@@ -556,12 +562,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.

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

 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.
@@ -670,6 +676,20 @@ Emitted when the window has closed a sheet.

 Emitted when the native new tab button is clicked.

+#### Event: 'system-context-menu' _Windows_
+
+Returns:
+
+* `event` Event
+* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
+
+Emitted when the system context menu is triggered on the window, this is
+normally only triggered when the user right clicks on the non-client area
+of your window.  This is the window titlebar or any area you have declared
+as `-webkit-app-region: drag` in a frameless window.
+
+Calling `event.preventDefault()` will prevent the menu from being displayed.
+
 ### Static Methods

 The `BrowserWindow` class has the following static methods:
@@ -1029,7 +1049,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])` _macOS_ _Linux_
+#### `win.setAspectRatio(aspectRatio[, extraSize])`

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
@@ -1050,6 +1070,9 @@ 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,
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -198,6 +198,14 @@ logging level for all code in the source files under a `foo/bar` directory.

 This switch only works when `--enable-logging` is also passed.

+### --force_high_performance_gpu
+
+Force using discrete GPU when there are multiple GPUs available.
+
+### --force_low_power_gpu
+
+Force using integrated GPU when there are multiple GPUs available.
+
 ## Node.js Flags

 Electron supports some of the [CLI flags][node-cli] supported by Node.js.
--- 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({
-      include_categories: ['*']
+      included_categories: ['*']
    })
    console.log('Tracing started')
    await new Promise(resolve => setTimeout(resolve, 5000))
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -114,3 +114,9 @@ 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. You should not use this module until the `ready`
+not have the keyboard focus. This module cannot be used before the `ready`
 event of the app module is emitted.

 ```javascript
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -91,7 +91,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`

 * `channel` String
-* `listener` Function<Promise<void> | any>
+* `listener` Function<Promise\<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

@@ -123,7 +123,7 @@ WebContents is the source of the invoke request.
 ### `ipcMain.handleOnce(channel, listener)`

 * `channel` String
-* `listener` Function<Promise<void> | any>
+* `listener` Function<Promise\<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -61,9 +61,13 @@ 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 is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **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.

 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
@@ -85,9 +89,13 @@ 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 is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **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.

 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
@@ -123,9 +131,13 @@ 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 is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **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.

 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -349,6 +349,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 * `handler` Function | null
  * `webContents` [WebContents](web-contents.md) - WebContents requesting the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
  * `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.
    * `mediaKeySystem` - Request access to DRM protected content.
    * `geolocation` - Request access to user's current location.
@@ -384,7 +385,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents

 #### `ses.setPermissionCheckHandler(handler)`

-* `handler` Function<Boolean> | null
+* `handler` Function\<Boolean> | null
  * `webContents` [WebContents](web-contents.md) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
  * `permission` String - Enum of 'media'.
  * `requestingOrigin` String - The origin URL of the permission check
--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -1,5 +1,6 @@
 # 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
--- a/docs/api/structures/ipc-main-invoke-event.md
+++ b/docs/api/structures/ipc-main-invoke-event.md
@@ -1,4 +1,5 @@
 # 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
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -42,7 +42,8 @@ returns `null`.

 * `id` Integer

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

 ## Class: WebContents

@@ -364,7 +365,7 @@ Returns:
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
    * `crashed` - Process crashed
    * `oom` - Process ran out of memory
-    * `launch-failure` - Process never successfully launched
+    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed

 Emitted when the renderer process unexpectedly disappears.  This is normally
@@ -998,6 +999,34 @@ Navigates to the specified offset from the "current entry".

 Returns `Boolean` - Whether the renderer process has crashed.

+#### `contents.forcefullyCrashRenderer()`
+
+Forcefully terminates the renderer process that is currently hosting this
+`webContents`. This will cause the `render-process-gone` event to be emitted
+with the `reason=killed || reason=crashed`. Please note that some webContents share renderer
+processes and therefore calling this method may also crash the host process
+for other webContents as well.
+
+Calling `reload()` immediately after calling this
+method will force the reload to occur in a new process. This should be used
+when this process is unstable or unusable, for instance in order to recover
+from the `unresponsive` event.
+
+```js
+contents.on('unresponsive', async () => {
+  const { response } = await dialog.showMessageBox({
+    message: 'App X has become unresponsive',
+    title: 'Do you want to try forcefully reloading the app?',
+    buttons: ['OK', 'Cancel'],
+    cancelId: 1
+  })
+  if (response === 0) {
+    contents.forcefullyCrashRenderer()
+    contents.reload()
+  }
+})
+```
+
 #### `contents.setUserAgent(userAgent)`

 * `userAgent` String
@@ -1296,9 +1325,9 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
  * `collate` Boolean (optional) - Whether the web page should be collated.
  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the start page.
-    * `to` Number - the end page.
+  * `pageRanges` Object[] (optional) - The page range to print. On macOS, only one range is honored.
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
  * `dpi` Record<string, number> (optional)
    * `horizontal` Number (optional) - The horizontal dpi.
@@ -1324,10 +1353,10 @@ Example usage:
 const options = {
  silent: true,
  deviceName: 'My-Printer',
-  pageRanges: {
+  pageRanges: [{
    from: 0,
    to: 1
-  }
+  }]
 }
 win.webContents.print(options, (success, errorType) => {
  if (!success) console.log(errorType)
@@ -1345,8 +1374,8 @@ win.webContents.print(options, (success, errorType) => {
    default margin, 1 for no margin, and 2 for minimum margin.
  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - zero-based index of the first page to print.
-    * `to` Number - zero-based index of the last page to print (inclusive).
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
@@ -1556,8 +1585,7 @@ 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 is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> special Electron objects will throw an exception.

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

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

-* `frameId` Integer
+* `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.
 * `channel` String
 * `...args` any[]

@@ -1603,9 +1633,8 @@ 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 is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1767,7 +1796,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 60 are accepted.
+Only values between 1 and 240 are accepted.

 #### `contents.getFrameRate()`

@@ -1865,7 +1894,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 60 are accepted.
+Only values between 1 and 240 are accepted.

 Only applicable if *offscreen rendering* is enabled.

--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -560,9 +560,9 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
  * `collate` Boolean (optional) - Whether the web page should be collated.
  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - zero-based index of the first page to print.
-    * `to` Number - zero-based index of the last page to print (inclusive).
+  * `pageRanges` Object[] (optional) - The page range to print.
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
  * `dpi` Record<string, number> (optional)
    * `horizontal` Number (optional) - The horizontal dpi.
@@ -588,8 +588,8 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
    and `width` in microns.
  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - the first page to print.
-    * `to` Number - the last page to print (inclusive).
+    * `from` Number - Index of the first page to print (0-based).
+    * `to` Number - Index of the last page to print (inclusive) (0-based).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
@@ -968,4 +968,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/apps/tags/webview
+[chrome-webview]: https://developer.chrome.com/docs/extensions/reference/webviewTag/
--- a/docs/breaking-changes-ns.md
+++ b/docs/breaking-changes-ns.md
@@ -1,61 +0,0 @@
-# Breaking changes (NetworkService) (Draft)
-
-This document describes changes to Electron APIs after migrating network code
-to NetworkService API.
-
-We don't currently have an estimate of when we will enable `NetworkService` by
-default in Electron, but as Chromium is already removing non-`NetworkService`
-code, we might switch before Electron 10.
-
-The content of this document should be moved to `breaking-changes.md` once we have
-determined when to enable `NetworkService` in Electron.
-
-## Planned Breaking API Changes
-
-### `protocol.unregisterProtocol`
-### `protocol.uninterceptProtocol`
-
-The APIs are now synchronous and the optional callback is no longer needed.
-
-```javascript
-// Deprecated
-protocol.unregisterProtocol(scheme, () => { /* ... */ })
-// Replace with
-protocol.unregisterProtocol(scheme)
-```
-
-### `protocol.registerFileProtocol`
-### `protocol.registerBufferProtocol`
-### `protocol.registerStringProtocol`
-### `protocol.registerHttpProtocol`
-### `protocol.registerStreamProtocol`
-### `protocol.interceptFileProtocol`
-### `protocol.interceptStringProtocol`
-### `protocol.interceptBufferProtocol`
-### `protocol.interceptHttpProtocol`
-### `protocol.interceptStreamProtocol`
-
-The APIs are now synchronous and the optional callback is no longer needed.
-
-```javascript
-// Deprecated
-protocol.registerFileProtocol(scheme, handler, () => { /* ... */ })
-// Replace with
-protocol.registerFileProtocol(scheme, handler)
-```
-
-The registered or intercepted protocol does not have effect on current page
-until navigation happens.
-
-### `protocol.isProtocolHandled`
-
-This API is deprecated and users should use `protocol.isProtocolRegistered`
-and `protocol.isProtocolIntercepted` instead.
-
-```javascript
-// Deprecated
-protocol.isProtocolHandled(scheme).then(() => { /* ... */ })
-// Replace with
-const isRegistered = protocol.isProtocolRegistered(scheme)
-const isIntercepted = protocol.isProtocolIntercepted(scheme)
-```
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -133,6 +133,54 @@ const w = new BrowserWindow({
 We [recommend moving away from the remote
 module](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).

+### `protocol.unregisterProtocol`
+### `protocol.uninterceptProtocol`
+
+The APIs are now synchronous and the optional callback is no longer needed.
+
+```javascript
+// Deprecated
+protocol.unregisterProtocol(scheme, () => { /* ... */ })
+// Replace with
+protocol.unregisterProtocol(scheme)
+```
+
+### `protocol.registerFileProtocol`
+### `protocol.registerBufferProtocol`
+### `protocol.registerStringProtocol`
+### `protocol.registerHttpProtocol`
+### `protocol.registerStreamProtocol`
+### `protocol.interceptFileProtocol`
+### `protocol.interceptStringProtocol`
+### `protocol.interceptBufferProtocol`
+### `protocol.interceptHttpProtocol`
+### `protocol.interceptStreamProtocol`
+
+The APIs are now synchronous and the optional callback is no longer needed.
+
+```javascript
+// Deprecated
+protocol.registerFileProtocol(scheme, handler, () => { /* ... */ })
+// Replace with
+protocol.registerFileProtocol(scheme, handler)
+```
+
+The registered or intercepted protocol does not have effect on current page
+until navigation happens.
+
+### `protocol.isProtocolHandled`
+
+This API is deprecated and users should use `protocol.isProtocolRegistered`
+and `protocol.isProtocolIntercepted` instead.
+
+```javascript
+// Deprecated
+protocol.isProtocolHandled(scheme).then(() => { /* ... */ })
+// Replace with
+const isRegistered = protocol.isProtocolRegistered(scheme)
+const isIntercepted = protocol.isProtocolIntercepted(scheme)
+```
+
 ## Planned Breaking API Changes (9.0)

 ### Default Changed: Loading non-context-aware native modules in the renderer process is disabled by default
@@ -147,6 +195,45 @@ 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.
@@ -290,6 +377,52 @@ 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-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -177,12 +177,12 @@ $ gn gen out/Testing-x86 --args='... target_cpu = "x86"'

 Not all combinations of source and target CPU/OS are supported by Chromium.

-<table>
-<tr><th>Host</th><th>Target</th><th>Status</th></tr>
-<tr><td>Windows x64</td><td>Windows arm64</td><td>Experimental</td>
-<tr><td>Windows x64</td><td>Windows x86</td><td>Automatically tested</td></tr>
-<tr><td>Linux x64</td><td>Linux x86</td><td>Automatically tested</td></tr>
-</table>
+| Host        | Target        | Status               |
+|-------------|---------------|----------------------|
+| Windows x64 | Windows arm64 | Experimental         |
+| Windows x64 | Windows x86   | Automatically tested |
+| Linux x64   | Linux x86     | Automatically tested |
+

 If you test other combinations and find them to work, please update this document :)

--- 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 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.
+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.

 ## Building Electron

--- a/docs/development/setting-up-symbol-server.md
+++ b/docs/development/setting-up-symbol-server.md
@@ -43,8 +43,8 @@ SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\sym

 ## Using the symbol server in Visual Studio

-<img src='https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg'>
-<img src='https://mdn.mozillademos.org/files/2497/2005_options.gif'>
+![Tools -> Options](https://mdn.mozillademos.org/files/733/symbol-server-vc8express-menu.jpg)
+![Symbols Settings](https://mdn.mozillademos.org/files/2497/2005_options.gif)

 ## Troubleshooting: Symbols will not load

--- a/docs/fiddles/features/drag-and-drop/index.html
+++ b/docs/fiddles/features/drag-and-drop/index.html
@@ -0,0 +1,18 @@
+<!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
@@ -0,0 +1,41 @@
+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
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,31 @@
+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
@@ -0,0 +1,14 @@
+<!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
@@ -0,0 +1,13 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,39 @@
+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
@@ -0,0 +1,19 @@
+<!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
@@ -0,0 +1,40 @@
+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
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,7 @@
+@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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,43 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,35 @@
+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
@@ -0,0 +1,17 @@
+<!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
@@ -0,0 +1,27 @@
+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
@@ -0,0 +1,7 @@
+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
@@ -0,0 +1,15 @@
+<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
@@ -0,0 +1,28 @@
+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
@@ -0,0 +1,17 @@
+<!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
@@ -0,0 +1,24 @@
+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
@@ -0,0 +1,7 @@
+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
@@ -0,0 +1,17 @@
+<!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
@@ -0,0 +1,20 @@
+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
@@ -0,0 +1,6 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,30 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,34 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,33 @@
+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
@@ -0,0 +1,16 @@
+<!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
@@ -0,0 +1,27 @@
+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/devtools-extension.md
+++ b/docs/tutorial/devtools-extension.md
@@ -1,25 +1,28 @@
 # DevTools Extension

-Electron supports the [Chrome DevTools Extension][devtools-extension], which can
-be used to extend the ability of devtools for debugging popular web frameworks.
+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.

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

-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.
+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.

-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.
+## Manually loading a DevTools extension

-Using the [React Developer Tools][react-devtools] as example:
+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.

-1. Install it in Chrome browser.
+Using the [React Developer Tools][react-devtools] as an example:
+
+1. Install the extension in Google Chrome.
 1. Navigate to `chrome://extensions`, and find its extension ID, which is a hash
   string like `fmkadmapgofadopljbjfkapdkoienihi`.
-1. Find out filesystem location used by Chrome for storing extensions:
+1. Find out the 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/`
@@ -27,36 +30,48 @@ Using the [React Developer Tools][react-devtools] as 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 `BrowserWindow.addDevToolsExtension`
-   API, for the React Developer Tools, it is something like:
+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:
   ```javascript
-   const path = require('path')
-   const os = require('os')
+    const { app, session } = require('electron')
+    const path = require('path')
+    const os = require('os')

-   BrowserWindow.addDevToolsExtension(
-      path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/4.3.0_0')
-   )
+    // 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)
+    })
   ```

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

-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.
+* `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.

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

-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.
+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.

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

-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:
+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:

 * [Ember Inspector](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
 * [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi)
@@ -68,14 +83,22 @@ Following Devtools Extensions are tested and guaranteed 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, some extensions
-can not even work for recent versions of Chrome browser, and we are not able to
-do anything for them.
+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.

-Then file a bug at Electron's issues list, and describe which part of the
-extension is not working as expected.
+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.

 [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
+[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/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 60, because above that there is no benefit, only
+maximum frame rate is 240, 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/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -80,4 +80,8 @@
      Windows Utilities
    </message>
  </if>
+  <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>
 </grit-part>
--- a/filenames.gni
+++ b/filenames.gni
@@ -21,12 +21,215 @@ filenames = {
    "node_modules/@primer/octicons/build/svg/star-fill-24.svg",
  ]

-  lib_sources = [
-    "chromium_src/chrome/browser/process_singleton.h",
-    "chromium_src/chrome/browser/process_singleton_posix.cc",
-    "chromium_src/chrome/browser/process_singleton_win.cc",
+  lib_sources_linux = [
    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
+    "shell/browser/ui/file_dialog_gtk.cc",
+    "shell/browser/ui/message_box_gtk.cc",
+    "shell/browser/ui/tray_icon_gtk.cc",
+    "shell/browser/ui/tray_icon_gtk.h",
+    "shell/browser/ui/views/global_menu_bar_x11.cc",
+    "shell/browser/ui/views/global_menu_bar_x11.h",
+    "shell/browser/ui/x/event_disabler.cc",
+    "shell/browser/ui/x/event_disabler.h",
+    "shell/browser/ui/x/window_state_watcher.cc",
+    "shell/browser/ui/x/window_state_watcher.h",
+    "shell/browser/ui/x/x_window_utils.cc",
+    "shell/browser/ui/x/x_window_utils.h",
+    "shell/browser/browser_linux.cc",
+    "shell/browser/lib/power_observer_linux.cc",
+    "shell/browser/lib/power_observer_linux.h",
+    "shell/browser/notifications/linux/notification_presenter_linux.cc",
+    "shell/browser/notifications/linux/notification_presenter_linux.h",
+    "shell/browser/relauncher_linux.cc",
+    "shell/common/application_info_linux.cc",
+    "shell/common/language_util_linux.cc",
+    "shell/common/node_bindings_linux.cc",
+    "shell/common/node_bindings_linux.h",
+    "shell/common/platform_util_linux.cc",
+    "shell/browser/linux/unity_service.h",
+    "shell/browser/notifications/linux/libnotify_notification.cc",
+    "shell/browser/notifications/linux/libnotify_notification.h",
+    "shell/browser/linux/unity_service.cc",
+  ]
+
+  lib_sources_posix = [
+    "chromium_src/chrome/browser/process_singleton_posix.cc",
+    "shell/browser/electron_browser_main_parts_posix.cc",
+  ]
+
+  lib_sources_win = [
+    "chromium_src/chrome/browser/process_singleton_win.cc",
+    "shell/browser/api/electron_api_power_monitor_win.cc",
+    "shell/browser/api/electron_api_system_preferences_win.cc",
+    "shell/browser/browser_win.cc",
+    "shell/browser/native_window_views_win.cc",
+    "shell/browser/notifications/win/notification_presenter_win.cc",
+    "shell/browser/notifications/win/notification_presenter_win.h",
+    "shell/browser/notifications/win/notification_presenter_win7.cc",
+    "shell/browser/notifications/win/notification_presenter_win7.h",
+    "shell/browser/relauncher_win.cc",
+    "shell/browser/ui/certificate_trust_win.cc",
+    "shell/browser/ui/file_dialog_win.cc",
+    "shell/browser/ui/message_box_win.cc",
+    "shell/browser/ui/tray_icon_win.cc",
+    "shell/browser/ui/views/electron_views_delegate_win.cc",
+    "shell/browser/ui/views/win_frame_view.cc",
+    "shell/browser/ui/views/win_frame_view.h",
+    "shell/browser/ui/win/electron_desktop_window_tree_host_win.cc",
+    "shell/browser/ui/win/electron_desktop_window_tree_host_win.h",
+    "shell/common/api/electron_api_native_image_win.cc",
+    "shell/common/application_info_win.cc",
+    "shell/common/language_util_win.cc",
+    "shell/common/node_bindings_win.cc",
+    "shell/common/node_bindings_win.h",
+    "shell/common/platform_util_win.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/common.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast.h",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc",
+    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h",
+    "shell/browser/notifications/win/win32_notification.cc",
+    "shell/browser/notifications/win/win32_notification.h",
+    "shell/browser/notifications/win/windows_toast_notification.cc",
+    "shell/browser/notifications/win/windows_toast_notification.h",
+    "shell/browser/ui/win/dialog_thread.cc",
+    "shell/browser/ui/win/dialog_thread.h",
+    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
+    "shell/browser/ui/win/electron_desktop_native_widget_aura.h",
+    "shell/browser/ui/win/jump_list.cc",
+    "shell/browser/ui/win/jump_list.h",
+    "shell/browser/ui/win/notify_icon.cc",
+    "shell/browser/ui/win/notify_icon.h",
+    "shell/browser/ui/win/notify_icon_host.cc",
+    "shell/browser/ui/win/notify_icon_host.h",
+    "shell/browser/ui/win/taskbar_host.cc",
+    "shell/browser/ui/win/taskbar_host.h",
+    "shell/browser/win/scoped_hstring.cc",
+    "shell/browser/win/scoped_hstring.h",
+  ]
+
+  lib_sources_mac = [
+    "shell/app/electron_main_delegate_mac.h",
+    "shell/app/electron_main_delegate_mac.mm",
+    "shell/browser/api/electron_api_app_mac.mm",
+    "shell/browser/api/electron_api_browser_window_mac.mm",
+    "shell/browser/api/electron_api_menu_mac.h",
+    "shell/browser/api/electron_api_menu_mac.mm",
+    "shell/browser/api/electron_api_native_theme_mac.mm",
+    "shell/browser/api/electron_api_power_monitor_mac.mm",
+    "shell/browser/api/electron_api_system_preferences_mac.mm",
+    "shell/browser/api/electron_api_web_contents_mac.mm",
+    "shell/browser/auto_updater_mac.mm",
+    "shell/browser/browser_mac.mm",
+    "shell/browser/notifications/mac/notification_center_delegate.h",
+    "shell/browser/notifications/mac/notification_center_delegate.mm",
+    "shell/common/mac/main_application_bundle.h",
+    "shell/common/mac/main_application_bundle.mm",
+    "shell/browser/common_web_contents_delegate_mac.mm",
+    "shell/browser/electron_browser_main_parts_mac.mm",
+    "shell/browser/native_browser_view_mac.h",
+    "shell/browser/native_browser_view_mac.mm",
+    "shell/browser/native_window_mac.h",
+    "shell/browser/native_window_mac.mm",
+    "shell/browser/notifications/mac/notification_presenter_mac.h",
+    "shell/browser/notifications/mac/notification_presenter_mac.mm",
+    "shell/browser/relauncher_mac.cc",
+    "shell/browser/ui/certificate_trust_mac.mm",
+    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
+    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
+    "shell/browser/ui/cocoa/root_view_mac.h",
+    "shell/browser/ui/cocoa/root_view_mac.mm",
+    "shell/browser/ui/cocoa/views_delegate_mac.h",
+    "shell/browser/ui/cocoa/views_delegate_mac.mm",
+    "shell/browser/ui/drag_util_mac.mm",
+    "shell/browser/ui/file_dialog_mac.mm",
+    "shell/browser/ui/inspectable_web_contents_view_mac.h",
+    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
+    "shell/browser/ui/message_box_mac.mm",
+    "shell/common/api/electron_api_clipboard_mac.mm",
+    "shell/common/api/electron_api_native_image_mac.mm",
+    "shell/common/application_info_mac.mm",
+    "shell/common/language_util_mac.mm",
+    "shell/common/node_bindings_mac.cc",
+    "shell/common/node_bindings_mac.h",
+    "shell/common/platform_util_mac.mm",
+    "shell/browser/notifications/mac/cocoa_notification.h",
+    "shell/browser/notifications/mac/cocoa_notification.mm",
+    "shell/browser/ui/cocoa/NSColor+Hex.h",
+    "shell/browser/ui/cocoa/NSColor+Hex.mm",
+    "shell/browser/ui/cocoa/NSString+ANSI.h",
+    "shell/browser/ui/cocoa/NSString+ANSI.mm",
+    "shell/browser/ui/cocoa/delayed_native_view_host.cc",
+    "shell/browser/ui/cocoa/delayed_native_view_host.h",
+    "shell/browser/ui/cocoa/electron_bundle_mover.h",
+    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
+    "shell/browser/ui/cocoa/electron_menu_controller.h",
+    "shell/browser/ui/cocoa/electron_menu_controller.mm",
+    "shell/browser/ui/cocoa/electron_ns_window.h",
+    "shell/browser/ui/cocoa/electron_ns_window.mm",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
+    "shell/browser/ui/cocoa/electron_preview_item.h",
+    "shell/browser/ui/cocoa/electron_preview_item.mm",
+    "shell/browser/ui/cocoa/electron_touch_bar.h",
+    "shell/browser/ui/cocoa/electron_touch_bar.mm",
+    "shell/browser/ui/cocoa/event_dispatching_window.h",
+    "shell/browser/ui/cocoa/event_dispatching_window.mm",
+    "shell/browser/ui/tray_icon_cocoa.h",
+    "shell/browser/ui/tray_icon_cocoa.mm",
+    "shell/browser/mac/dict_util.h",
+    "shell/browser/mac/dict_util.mm",
+    "shell/browser/mac/electron_application.h",
+    "shell/browser/mac/electron_application.mm",
+    "shell/browser/mac/electron_application_delegate.h",
+    "shell/browser/mac/electron_application_delegate.mm",
+    "shell/browser/mac/in_app_purchase.h",
+    "shell/browser/mac/in_app_purchase.mm",
+    "shell/browser/mac/in_app_purchase_observer.h",
+    "shell/browser/mac/in_app_purchase_observer.mm",
+    "shell/browser/mac/in_app_purchase_product.h",
+    "shell/browser/mac/in_app_purchase_product.mm",
+  ]
+
+  lib_sources_views = [
+    "shell/browser/api/electron_api_browser_window_views.cc",
+    "shell/browser/api/electron_api_menu_views.cc",
+    "shell/browser/api/electron_api_menu_views.h",
+    "shell/browser/common_web_contents_delegate_views.cc",
+    "shell/browser/native_browser_view_views.cc",
+    "shell/browser/native_browser_view_views.h",
+    "shell/browser/native_window_views.cc",
+    "shell/browser/native_window_views.h",
+    "shell/browser/ui/drag_util_views.cc",
+    "shell/browser/ui/views/inspectable_web_contents_view_views.cc",
+    "shell/browser/ui/views/inspectable_web_contents_view_views.h",
+    "shell/browser/ui/views/autofill_popup_view.cc",
+    "shell/browser/ui/views/autofill_popup_view.h",
+    "shell/browser/ui/views/electron_views_delegate.cc",
+    "shell/browser/ui/views/electron_views_delegate.h",
+    "shell/browser/ui/views/frameless_view.cc",
+    "shell/browser/ui/views/frameless_view.h",
+    "shell/browser/ui/views/menu_bar.cc",
+    "shell/browser/ui/views/menu_bar.h",
+    "shell/browser/ui/views/menu_delegate.cc",
+    "shell/browser/ui/views/menu_delegate.h",
+    "shell/browser/ui/views/menu_model_adapter.cc",
+    "shell/browser/ui/views/menu_model_adapter.h",
+    "shell/browser/ui/views/native_frame_view.cc",
+    "shell/browser/ui/views/native_frame_view.h",
+    "shell/browser/ui/views/root_view.cc",
+    "shell/browser/ui/views/root_view.h",
+    "shell/browser/ui/views/submenu_button.cc",
+    "shell/browser/ui/views/submenu_button.h",
+  ]
+
+  lib_sources = [
+    "chromium_src/chrome/browser/process_singleton.h",
    "shell/app/command_line_args.cc",
    "shell/app/command_line_args.h",
    "shell/app/electron_content_client.cc",
@@ -35,13 +238,10 @@ filenames = {
    "shell/app/electron_crash_reporter_client.h",
    "shell/app/electron_main_delegate.cc",
    "shell/app/electron_main_delegate.h",
-    "shell/app/electron_main_delegate_mac.h",
-    "shell/app/electron_main_delegate_mac.mm",
    "shell/app/uv_task_runner.cc",
    "shell/app/uv_task_runner.h",
    "shell/browser/api/electron_api_app.cc",
    "shell/browser/api/electron_api_app.h",
-    "shell/browser/api/electron_api_app_mac.mm",
    "shell/browser/api/electron_api_auto_updater.cc",
    "shell/browser/api/electron_api_auto_updater.h",
    "shell/browser/api/electron_api_base_window.cc",
@@ -50,8 +250,6 @@ filenames = {
    "shell/browser/api/electron_api_browser_view.h",
    "shell/browser/api/electron_api_browser_window.cc",
    "shell/browser/api/electron_api_browser_window.h",
-    "shell/browser/api/electron_api_browser_window_mac.mm",
-    "shell/browser/api/electron_api_browser_window_views.cc",
    "shell/browser/api/electron_api_content_tracing.cc",
    "shell/browser/api/electron_api_cookies.cc",
    "shell/browser/api/electron_api_cookies.h",
@@ -73,13 +271,8 @@ filenames = {
    "shell/browser/api/electron_api_in_app_purchase.h",
    "shell/browser/api/electron_api_menu.cc",
    "shell/browser/api/electron_api_menu.h",
-    "shell/browser/api/electron_api_menu_mac.h",
-    "shell/browser/api/electron_api_menu_mac.mm",
-    "shell/browser/api/electron_api_menu_views.cc",
-    "shell/browser/api/electron_api_menu_views.h",
    "shell/browser/api/electron_api_native_theme.cc",
    "shell/browser/api/electron_api_native_theme.h",
-    "shell/browser/api/electron_api_native_theme_mac.mm",
    "shell/browser/api/electron_api_net.cc",
    "shell/browser/api/electron_api_net_log.cc",
    "shell/browser/api/electron_api_net_log.h",
@@ -87,8 +280,6 @@ filenames = {
    "shell/browser/api/electron_api_notification.h",
    "shell/browser/api/electron_api_power_monitor.cc",
    "shell/browser/api/electron_api_power_monitor.h",
-    "shell/browser/api/electron_api_power_monitor_mac.mm",
-    "shell/browser/api/electron_api_power_monitor_win.cc",
    "shell/browser/api/electron_api_power_save_blocker.cc",
    "shell/browser/api/electron_api_power_save_blocker.h",
    "shell/browser/api/electron_api_protocol.cc",
@@ -101,8 +292,6 @@ filenames = {
    "shell/browser/api/electron_api_session.h",
    "shell/browser/api/electron_api_system_preferences.cc",
    "shell/browser/api/electron_api_system_preferences.h",
-    "shell/browser/api/electron_api_system_preferences_mac.mm",
-    "shell/browser/api/electron_api_system_preferences_win.cc",
    "shell/browser/api/electron_api_tray.cc",
    "shell/browser/api/electron_api_tray.h",
    "shell/browser/api/electron_api_url_loader.cc",
@@ -112,7 +301,6 @@ filenames = {
    "shell/browser/api/electron_api_web_contents.cc",
    "shell/browser/api/electron_api_web_contents.h",
    "shell/browser/api/electron_api_web_contents_impl.cc",
-    "shell/browser/api/electron_api_web_contents_mac.mm",
    "shell/browser/api/electron_api_web_contents_view.cc",
    "shell/browser/api/electron_api_web_contents_view.h",
    "shell/browser/api/electron_api_web_request.cc",
@@ -136,21 +324,15 @@ filenames = {
    "shell/browser/api/ui_event.h",
    "shell/browser/auto_updater.cc",
    "shell/browser/auto_updater.h",
-    "shell/browser/auto_updater_mac.mm",
    "shell/browser/browser.cc",
    "shell/browser/browser.h",
-    "shell/browser/browser_linux.cc",
-    "shell/browser/browser_mac.mm",
    "shell/browser/browser_observer.h",
    "shell/browser/browser_process_impl.cc",
    "shell/browser/browser_process_impl.h",
-    "shell/browser/browser_win.cc",
    "shell/browser/child_web_contents_tracker.cc",
    "shell/browser/child_web_contents_tracker.h",
    "shell/browser/common_web_contents_delegate.cc",
    "shell/browser/common_web_contents_delegate.h",
-    "shell/browser/common_web_contents_delegate_mac.mm",
-    "shell/browser/common_web_contents_delegate_views.cc",
    "shell/browser/cookie_change_notifier.cc",
    "shell/browser/cookie_change_notifier.h",
    "shell/browser/electron_autofill_driver.cc",
@@ -163,8 +345,6 @@ filenames = {
    "shell/browser/electron_browser_context.h",
    "shell/browser/electron_browser_main_parts.cc",
    "shell/browser/electron_browser_main_parts.h",
-    "shell/browser/electron_browser_main_parts_mac.mm",
-    "shell/browser/electron_browser_main_parts_posix.cc",
    "shell/browser/electron_download_manager_delegate.cc",
    "shell/browser/electron_download_manager_delegate.h",
    "shell/browser/electron_gpu_client.cc",
@@ -183,32 +363,20 @@ filenames = {
    "shell/browser/electron_web_ui_controller_factory.h",
    "shell/browser/event_emitter_mixin.cc",
    "shell/browser/event_emitter_mixin.h",
+    "shell/browser/extended_web_contents_observer.h",
    "shell/browser/feature_list.cc",
    "shell/browser/feature_list.h",
+    "shell/browser/file_select_helper.cc",
+    "shell/browser/file_select_helper.h",
+    "shell/browser/file_select_helper_mac.mm",
    "shell/browser/font_defaults.cc",
    "shell/browser/font_defaults.h",
    "shell/browser/javascript_environment.cc",
    "shell/browser/javascript_environment.h",
    "shell/browser/lib/bluetooth_chooser.cc",
    "shell/browser/lib/bluetooth_chooser.h",
-    "shell/browser/lib/power_observer_linux.cc",
-    "shell/browser/lib/power_observer_linux.h",
-    "shell/browser/linux/unity_service.cc",
-    "shell/browser/linux/unity_service.h",
    "shell/browser/login_handler.cc",
    "shell/browser/login_handler.h",
-    "shell/browser/mac/dict_util.h",
-    "shell/browser/mac/dict_util.mm",
-    "shell/browser/mac/electron_application.h",
-    "shell/browser/mac/electron_application.mm",
-    "shell/browser/mac/electron_application_delegate.h",
-    "shell/browser/mac/electron_application_delegate.mm",
-    "shell/browser/mac/in_app_purchase.h",
-    "shell/browser/mac/in_app_purchase.mm",
-    "shell/browser/mac/in_app_purchase_observer.h",
-    "shell/browser/mac/in_app_purchase_observer.mm",
-    "shell/browser/mac/in_app_purchase_product.h",
-    "shell/browser/mac/in_app_purchase_product.mm",
    "shell/browser/media/media_capture_devices_dispatcher.cc",
    "shell/browser/media/media_capture_devices_dispatcher.h",
    "shell/browser/media/media_device_id_salt.cc",
@@ -219,18 +387,9 @@ filenames = {
    "shell/browser/microtasks_runner.h",
    "shell/browser/native_browser_view.cc",
    "shell/browser/native_browser_view.h",
-    "shell/browser/native_browser_view_mac.h",
-    "shell/browser/native_browser_view_mac.mm",
-    "shell/browser/native_browser_view_views.cc",
-    "shell/browser/native_browser_view_views.h",
    "shell/browser/native_window.cc",
    "shell/browser/native_window.h",
-    "shell/browser/native_window_mac.h",
-    "shell/browser/native_window_mac.mm",
    "shell/browser/native_window_observer.h",
-    "shell/browser/native_window_views.cc",
-    "shell/browser/native_window_views.h",
-    "shell/browser/native_window_views_win.cc",
    "shell/browser/net/asar/asar_url_loader.cc",
    "shell/browser/net/asar/asar_url_loader.h",
    "shell/browser/net/cert_verifier_client.cc",
@@ -258,16 +417,6 @@ filenames = {
    "shell/browser/network_hints_handler_impl.h",
    "shell/browser/node_debugger.cc",
    "shell/browser/node_debugger.h",
-    "shell/browser/notifications/linux/libnotify_notification.cc",
-    "shell/browser/notifications/linux/libnotify_notification.h",
-    "shell/browser/notifications/linux/notification_presenter_linux.cc",
-    "shell/browser/notifications/linux/notification_presenter_linux.h",
-    "shell/browser/notifications/mac/cocoa_notification.h",
-    "shell/browser/notifications/mac/cocoa_notification.mm",
-    "shell/browser/notifications/mac/notification_center_delegate.h",
-    "shell/browser/notifications/mac/notification_center_delegate.mm",
-    "shell/browser/notifications/mac/notification_presenter_mac.h",
-    "shell/browser/notifications/mac/notification_presenter_mac.mm",
    "shell/browser/notifications/notification.cc",
    "shell/browser/notifications/notification.h",
    "shell/browser/notifications/notification_delegate.h",
@@ -275,21 +424,6 @@ filenames = {
    "shell/browser/notifications/notification_presenter.h",
    "shell/browser/notifications/platform_notification_service.cc",
    "shell/browser/notifications/platform_notification_service.h",
-    "shell/browser/notifications/win/notification_presenter_win.cc",
-    "shell/browser/notifications/win/notification_presenter_win.h",
-    "shell/browser/notifications/win/notification_presenter_win7.cc",
-    "shell/browser/notifications/win/notification_presenter_win7.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/common.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast.h",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc",
-    "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h",
-    "shell/browser/notifications/win/win32_notification.cc",
-    "shell/browser/notifications/win/win32_notification.h",
-    "shell/browser/notifications/win/windows_toast_notification.cc",
-    "shell/browser/notifications/win/windows_toast_notification.h",
    "shell/browser/plugins/plugin_utils.cc",
    "shell/browser/plugins/plugin_utils.h",
    "shell/browser/pref_store_delegate.cc",
@@ -298,9 +432,6 @@ filenames = {
    "shell/browser/protocol_registry.h",
    "shell/browser/relauncher.cc",
    "shell/browser/relauncher.h",
-    "shell/browser/relauncher_linux.cc",
-    "shell/browser/relauncher_mac.cc",
-    "shell/browser/relauncher_win.cc",
    "shell/browser/session_preferences.cc",
    "shell/browser/session_preferences.h",
    "shell/browser/special_storage_policy.cc",
@@ -310,116 +441,27 @@ filenames = {
    "shell/browser/ui/autofill_popup.cc",
    "shell/browser/ui/autofill_popup.h",
    "shell/browser/ui/certificate_trust.h",
-    "shell/browser/ui/certificate_trust_mac.mm",
-    "shell/browser/ui/certificate_trust_win.cc",
-    "shell/browser/ui/cocoa/NSColor+Hex.h",
-    "shell/browser/ui/cocoa/NSColor+Hex.mm",
-    "shell/browser/ui/cocoa/NSString+ANSI.h",
-    "shell/browser/ui/cocoa/NSString+ANSI.mm",
-    "shell/browser/ui/cocoa/delayed_native_view_host.cc",
-    "shell/browser/ui/cocoa/delayed_native_view_host.h",
-    "shell/browser/ui/cocoa/electron_bundle_mover.h",
-    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
-    "shell/browser/ui/cocoa/electron_menu_controller.h",
-    "shell/browser/ui/cocoa/electron_menu_controller.mm",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
-    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
-    "shell/browser/ui/cocoa/electron_ns_window.h",
-    "shell/browser/ui/cocoa/electron_ns_window.mm",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
-    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-    "shell/browser/ui/cocoa/electron_preview_item.h",
-    "shell/browser/ui/cocoa/electron_preview_item.mm",
-    "shell/browser/ui/cocoa/electron_touch_bar.h",
-    "shell/browser/ui/cocoa/electron_touch_bar.mm",
-    "shell/browser/ui/cocoa/event_dispatching_window.h",
-    "shell/browser/ui/cocoa/event_dispatching_window.mm",
-    "shell/browser/ui/cocoa/root_view_mac.h",
-    "shell/browser/ui/cocoa/root_view_mac.mm",
-    "shell/browser/ui/cocoa/views_delegate_mac.h",
-    "shell/browser/ui/cocoa/views_delegate_mac.mm",
    "shell/browser/ui/devtools_manager_delegate.cc",
    "shell/browser/ui/devtools_manager_delegate.h",
    "shell/browser/ui/devtools_ui.cc",
    "shell/browser/ui/devtools_ui.h",
+    "shell/browser/ui/drag_util.cc",
    "shell/browser/ui/drag_util.h",
-    "shell/browser/ui/drag_util_mac.mm",
-    "shell/browser/ui/drag_util_views.cc",
    "shell/browser/ui/electron_menu_model.cc",
    "shell/browser/ui/electron_menu_model.h",
    "shell/browser/ui/file_dialog.h",
-    "shell/browser/ui/file_dialog_gtk.cc",
-    "shell/browser/ui/file_dialog_mac.mm",
-    "shell/browser/ui/file_dialog_win.cc",
    "shell/browser/ui/inspectable_web_contents.cc",
    "shell/browser/ui/inspectable_web_contents.h",
    "shell/browser/ui/inspectable_web_contents_delegate.h",
    "shell/browser/ui/inspectable_web_contents_view.h",
    "shell/browser/ui/inspectable_web_contents_view_delegate.cc",
    "shell/browser/ui/inspectable_web_contents_view_delegate.h",
-    "shell/browser/ui/inspectable_web_contents_view_mac.h",
-    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
    "shell/browser/ui/message_box.h",
-    "shell/browser/ui/message_box_gtk.cc",
-    "shell/browser/ui/message_box_mac.mm",
-    "shell/browser/ui/message_box_win.cc",
    "shell/browser/ui/tray_icon.cc",
    "shell/browser/ui/tray_icon.h",
-    "shell/browser/ui/tray_icon_cocoa.h",
-    "shell/browser/ui/tray_icon_cocoa.mm",
-    "shell/browser/ui/tray_icon_gtk.cc",
-    "shell/browser/ui/tray_icon_gtk.h",
    "shell/browser/ui/tray_icon_observer.h",
-    "shell/browser/ui/tray_icon_win.cc",
-    "shell/browser/ui/views/autofill_popup_view.cc",
-    "shell/browser/ui/views/autofill_popup_view.h",
-    "shell/browser/ui/views/electron_views_delegate.cc",
-    "shell/browser/ui/views/electron_views_delegate.h",
-    "shell/browser/ui/views/electron_views_delegate_win.cc",
-    "shell/browser/ui/views/frameless_view.cc",
-    "shell/browser/ui/views/frameless_view.h",
-    "shell/browser/ui/views/global_menu_bar_x11.cc",
-    "shell/browser/ui/views/global_menu_bar_x11.h",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.cc",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.h",
-    "shell/browser/ui/views/menu_bar.cc",
-    "shell/browser/ui/views/menu_bar.h",
-    "shell/browser/ui/views/menu_delegate.cc",
-    "shell/browser/ui/views/menu_delegate.h",
-    "shell/browser/ui/views/menu_model_adapter.cc",
-    "shell/browser/ui/views/menu_model_adapter.h",
-    "shell/browser/ui/views/native_frame_view.cc",
-    "shell/browser/ui/views/native_frame_view.h",
-    "shell/browser/ui/views/root_view.cc",
-    "shell/browser/ui/views/root_view.h",
-    "shell/browser/ui/views/submenu_button.cc",
-    "shell/browser/ui/views/submenu_button.h",
-    "shell/browser/ui/views/win_frame_view.cc",
-    "shell/browser/ui/views/win_frame_view.h",
    "shell/browser/ui/webui/accessibility_ui.cc",
    "shell/browser/ui/webui/accessibility_ui.h",
-    "shell/browser/ui/win/dialog_thread.cc",
-    "shell/browser/ui/win/dialog_thread.h",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
-    "shell/browser/ui/win/electron_desktop_native_widget_aura.h",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.cc",
-    "shell/browser/ui/win/electron_desktop_window_tree_host_win.h",
-    "shell/browser/ui/win/jump_list.cc",
-    "shell/browser/ui/win/jump_list.h",
-    "shell/browser/ui/win/notify_icon.cc",
-    "shell/browser/ui/win/notify_icon.h",
-    "shell/browser/ui/win/notify_icon_host.cc",
-    "shell/browser/ui/win/notify_icon_host.h",
-    "shell/browser/ui/win/taskbar_host.cc",
-    "shell/browser/ui/win/taskbar_host.h",
-    "shell/browser/ui/x/event_disabler.cc",
-    "shell/browser/ui/x/event_disabler.h",
-    "shell/browser/ui/x/window_state_watcher.cc",
-    "shell/browser/ui/x/window_state_watcher.h",
-    "shell/browser/ui/x/x_window_utils.cc",
-    "shell/browser/ui/x/x_window_utils.h",
    "shell/browser/unresponsive_suppressor.cc",
    "shell/browser/unresponsive_suppressor.h",
    "shell/browser/web_contents_permission_helper.cc",
@@ -434,8 +476,6 @@ filenames = {
    "shell/browser/web_view_guest_delegate.h",
    "shell/browser/web_view_manager.cc",
    "shell/browser/web_view_manager.h",
-    "shell/browser/win/scoped_hstring.cc",
-    "shell/browser/win/scoped_hstring.h",
    "shell/browser/window_list.cc",
    "shell/browser/window_list.h",
    "shell/browser/window_list_observer.h",
@@ -444,13 +484,10 @@ filenames = {
    "shell/common/api/electron_api_asar.cc",
    "shell/common/api/electron_api_clipboard.cc",
    "shell/common/api/electron_api_clipboard.h",
-    "shell/common/api/electron_api_clipboard_mac.mm",
    "shell/common/api/electron_api_command_line.cc",
    "shell/common/api/electron_api_key_weak_map.h",
    "shell/common/api/electron_api_native_image.cc",
    "shell/common/api/electron_api_native_image.h",
-    "shell/common/api/electron_api_native_image_mac.mm",
-    "shell/common/api/electron_api_native_image_win.cc",
    "shell/common/api/electron_api_shell.cc",
    "shell/common/api/electron_api_v8_util.cc",
    "shell/common/api/electron_bindings.cc",
@@ -460,9 +497,6 @@ filenames = {
    "shell/common/api/object_life_monitor.h",
    "shell/common/application_info.cc",
    "shell/common/application_info.h",
-    "shell/common/application_info_linux.cc",
-    "shell/common/application_info_mac.mm",
-    "shell/common/application_info_win.cc",
    "shell/common/asar/archive.cc",
    "shell/common/asar/archive.h",
    "shell/common/asar/asar_util.cc",
@@ -545,30 +579,16 @@ filenames = {
    "shell/common/keyboard_util.cc",
    "shell/common/keyboard_util.h",
    "shell/common/language_util.h",
-    "shell/common/language_util_linux.cc",
-    "shell/common/language_util_mac.mm",
-    "shell/common/language_util_win.cc",
-    "shell/common/mac/main_application_bundle.h",
-    "shell/common/mac/main_application_bundle.mm",
    "shell/common/mouse_util.cc",
    "shell/common/mouse_util.h",
    "shell/common/node_bindings.cc",
    "shell/common/node_bindings.h",
-    "shell/common/node_bindings_linux.cc",
-    "shell/common/node_bindings_linux.h",
-    "shell/common/node_bindings_mac.cc",
-    "shell/common/node_bindings_mac.h",
-    "shell/common/node_bindings_win.cc",
-    "shell/common/node_bindings_win.h",
    "shell/common/node_includes.h",
    "shell/common/node_util.cc",
    "shell/common/node_util.h",
    "shell/common/options_switches.cc",
    "shell/common/options_switches.h",
    "shell/common/platform_util.h",
-    "shell/common/platform_util_linux.cc",
-    "shell/common/platform_util_mac.mm",
-    "shell/common/platform_util_win.cc",
    "shell/common/process_util.cc",
    "shell/common/process_util.h",
    "shell/common/skia_util.cc",
--- a/lib/asar/fs-wrapper.ts
+++ b/lib/asar/fs-wrapper.ts
@@ -612,9 +612,10 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (options.withFileTypes) {
      const dirents = [];
      for (const file of files) {
-        const stats = archive.stat(file);
+        const childPath = path.join(filePath, file);
+        const stats = archive.stat(childPath);
        if (!stats) {
-          const error = createError(AsarError.NOT_FOUND, { asarPath, filePath: file });
+          const error = createError(AsarError.NOT_FOUND, { asarPath, filePath: childPath });
          nextTick(callback!, [error]);
          return;
        }
@@ -654,9 +655,10 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (options && (options as any).withFileTypes) {
      const dirents = [];
      for (const file of files) {
-        const stats = archive.stat(file);
+        const childPath = path.join(filePath, file);
+        const stats = archive.stat(childPath);
        if (!stats) {
-          throw createError(AsarError.NOT_FOUND, { asarPath, filePath: file });
+          throw createError(AsarError.NOT_FOUND, { asarPath, filePath: childPath });
        }
        if (stats.isFile) {
          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_FILE));
@@ -686,7 +688,8 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
    if (info.size === 0) return ['', false];
    if (info.unpacked) {
      const realPath = archive.copyFileOut(filePath);
-      return fs.readFileSync(realPath, { encoding: 'utf8' });
+      const str = fs.readFileSync(realPath, { encoding: 'utf8' });
+      return [str, str.length > 0];
    }

    logASARAccess(asarPath, filePath, info.offset);
--- a/lib/browser/api/protocol.ts
+++ b/lib/browser/api/protocol.ts
@@ -17,8 +17,12 @@ Object.setPrototypeOf(protocol, new Proxy({}, {

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

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

  getOwnPropertyDescriptor () {
--- a/lib/browser/api/screen.ts
+++ b/lib/browser/api/screen.ts
@@ -1,20 +1,47 @@
+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, prop) => {
-    if (_screen === undefined) {
-      _screen = createScreen();
+  get: (target, property: keyof Electron.Screen) => {
+    createScreenIfNeeded();
+    const value = _screen[property];
+    if (typeof value === 'function') {
+      return value.bind(_screen);
    }
-    const v = (_screen as any)[prop];
-    if (typeof v === 'function') {
-      return v.bind(_screen);
-    }
-    return v;
+    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;
  }
 });
--- 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.getAppLevelAppearance;
+  const nativeEAGetter = systemPreferences.getEffectiveAppearance;
  Object.defineProperty(systemPreferences, 'effectiveAppearance', {
    get: () => nativeEAGetter.call(systemPreferences)
  });
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -161,29 +161,29 @@ WebContents.prototype._sendInternalToAll = function (channel, ...args) {

  return this._send(internal, sendToAll, channel, args);
 };
-WebContents.prototype.sendToFrame = function (frameId, channel, ...args) {
+WebContents.prototype.sendToFrame = function (frame, 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');
+  } else if (!(typeof frame === 'number' || Array.isArray(frame))) {
+    throw new Error('Missing required frame argument (must be number or array)');
  }

  const internal = false;
  const sendToAll = false;

-  return this._sendToFrame(internal, sendToAll, frameId, channel, args);
+  return this._sendToFrame(internal, sendToAll, frame, channel, args);
 };
-WebContents.prototype._sendToFrameInternal = function (frameId, channel, ...args) {
+WebContents.prototype._sendToFrameInternal = function (frame, 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');
+  } else if (!(typeof frame === 'number' || Array.isArray(frame))) {
+    throw new Error('Missing required frame argument (must be number or array)');
  }

  const internal = true;
  const sendToAll = false;

-  return this._sendToFrame(internal, sendToAll, frameId, channel, args);
+  return this._sendToFrame(internal, sendToAll, frame, channel, args);
 };

 // Following methods are mapped to webFrame.
@@ -439,8 +439,9 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
 };

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

@@ -462,8 +463,7 @@ const addReturnValueToEvent = (event: any) => {
 };

 const loggingEnabled = () => {
-  return Object.prototype.hasOwnProperty.call(process.env, 'ELECTRON_ENABLE_LOGGING') ||
-    process.argv.some(arg => arg.toLowerCase().startsWith('--enable-logging'));
+  return process.env.ELECTRON_ENABLE_LOGGING || app.commandLine.hasSwitch('enable-logging');
 };

 // Add JavaScript wrappers for WebContents class.
@@ -486,6 +486,13 @@ 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
+  });

  // Every remote callback from renderer process would add a listener to the
  // render-view-deleted event, so ignore the listeners warning.
@@ -548,17 +555,17 @@ WebContents.prototype._init = function () {

  this.on('crashed', (event, ...args) => {
    app.emit('renderer-process-crashed', event, this, ...args);
+  });
+
+  this.on('render-process-gone', (event, details) => {
+    app.emit('render-process-gone', event, this, details);

    // Log out a hint to help users better debug renderer crashes.
    if (loggingEnabled()) {
-      console.info('Renderer process crashed - see https://www.electronjs.org/docs/tutorial/application-debugging for potential debugging information.');
+      console.info(`Renderer process ${details.reason} - see https://www.electronjs.org/docs/tutorial/application-debugging for potential debugging information.`);
    }
  });

-  this.on('render-process-gone', (event, ...args) => {
-    app.emit('render-process-gone', event, this, ...args);
-  });
-
  // The devtools requests the webContents to reload.
  this.on('devtools-reload-page', function (this: Electron.WebContentsInternal) {
    this.reload();
@@ -616,6 +623,15 @@ WebContents.prototype._init = function () {
    app.emit('login', event, this, ...args);
  });

+  this.on('ready-to-show' as any, () => {
+    const owner = this.getOwnerBrowserWindow();
+    if (owner && !owner.isDestroyed()) {
+      process.nextTick(() => {
+        owner.emit('ready-to-show');
+      });
+    }
+  });
+
  const event = process._linkedBinding('electron_browser_event').createEmpty();
  app.emit('web-contents-created', event, this);

--- a/lib/browser/desktop-capturer.ts
+++ b/lib/browser/desktop-capturer.ts
@@ -48,6 +48,9 @@ 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) => {
@@ -66,7 +69,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/remote/server.ts
+++ b/lib/browser/remote/server.ts
@@ -19,7 +19,7 @@ const FUNCTION_PROPERTIES = [
 ];

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

@@ -31,7 +31,7 @@ const finalizationRegistry = new (globalThis as any).FinalizationRegistry((fi: F
  const ref = rendererFunctionCache.get(mapKey);
  if (ref !== undefined && ref.deref() === undefined) {
    rendererFunctionCache.delete(mapKey);
-    if (!fi.webContents.isDestroyed()) { fi.webContents.sendToFrame(fi.frameId, 'ELECTRON_RENDERER_RELEASE_CALLBACK', fi.id[0], fi.id[1]); }
+    if (!fi.webContents.isDestroyed()) { fi.webContents._sendToFrameInternal(fi.frameId, 'ELECTRON_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, value: CallIntoRenderer) {
+function setCachedRendererFunction (id: RendererFunctionId, wc: electron.WebContents, frameId: [number, number], value: CallIntoRenderer) {
  // eslint-disable-next-line no-undef
  const wr = new (globalThis as any).WeakRef(value) as WeakRef<CallIntoRenderer>;
  const mapKey = id[0] + '~' + id[1];
@@ -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, contextId: string, args: any[]) {
+const unwrapArgs = function (sender: electron.WebContents, frameId: [number, number], contextId: string, args: any[]) {
  const metaToValue = function (meta: MetaTypeFromRenderer): any {
    switch (meta.type) {
      case 'nativeimage':
@@ -263,7 +263,7 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: number, cont
        const callIntoRenderer = function (this: any, ...args: any[]) {
          let succeed = false;
          if (!sender.isDestroyed()) {
-            succeed = (sender as any)._sendToFrameInternal(frameId, 'ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args));
+            succeed = sender._sendToFrameInternal(frameId, 'ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args));
          }
          if (!succeed) {
            removeRemoteListenersAndLogWarning(this, callIntoRenderer);
@@ -421,7 +421,7 @@ handleRemoteCommand('ELECTRON_BROWSER_CURRENT_WEB_CONTENTS', function (event, co
 });

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

  if (constructor == null) {
@@ -432,7 +432,7 @@ handleRemoteCommand('ELECTRON_BROWSER_CONSTRUCTOR', function (event, contextId,
 });

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

  if (func == null) {
@@ -449,7 +449,7 @@ handleRemoteCommand('ELECTRON_BROWSER_FUNCTION_CALL', function (event, contextId
 });

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

  if (object == null) {
@@ -460,7 +460,7 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CONSTRUCTOR', function (event, cont
 });

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

  if (object == null) {
@@ -477,7 +477,7 @@ handleRemoteCommand('ELECTRON_BROWSER_MEMBER_CALL', function (event, contextId,
 });

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

  if (obj == null) {
--- a/lib/common/parse-features-string.ts
+++ b/lib/common/parse-features-string.ts
@@ -38,7 +38,7 @@ const keysOfTypeNumber = ['top', 'left', ...Object.keys(keysOfTypeNumberCompileT
 type CoercedValue = string | number | boolean;
 function coerce (key: string, value: string): CoercedValue {
  if (keysOfTypeNumber.includes(key)) {
-    return Number(value);
+    return parseInt(value, 10);
  }

  switch (value) {
--- a/lib/common/reset-search-paths.ts
+++ b/lib/common/reset-search-paths.ts
@@ -43,10 +43,10 @@ if (process.type === 'renderer') {
 }

 const originalResolveFilename = Module._resolveFilename;
-Module._resolveFilename = function (request: string, parent: NodeModule, isMain: boolean) {
+Module._resolveFilename = function (request: string, parent: NodeModule, isMain: boolean, options?: { paths: Array<string>}) {
  if (request === 'electron' || request.startsWith('electron/')) {
    return 'electron';
  } else {
-    return originalResolveFilename(request, parent, isMain);
+    return originalResolveFilename(request, parent, isMain, options);
  }
 };
--- a/lib/renderer/api/remote.ts
+++ b/lib/renderer/api/remote.ts
@@ -298,7 +298,7 @@ function metaToError (meta: { type: 'error', value: any, members: ObjectMember[]
 }

 function handleMessage (channel: string, handler: Function) {
-  ipcRendererInternal.on(channel, (event, passedContextId, id, ...args) => {
+  ipcRendererInternal.onMessageFromMain(channel, (event, passedContextId, id, ...args) => {
    if (passedContextId === contextId) {
      handler(id, ...args);
    } else {
--- a/lib/renderer/content-scripts-injector.ts
+++ b/lib/renderer/content-scripts-injector.ts
@@ -1,119 +0,0 @@
-import { webFrame } from 'electron';
-
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
-const v8Util = process._linkedBinding('electron_common_v8_util');
-
-const IsolatedWorldIDs = {
-  /**
-   * Start of extension isolated world IDs, as defined in
-   * electron_render_frame_observer.h
-   */
-  ISOLATED_WORLD_EXTENSIONS: 1 << 20
-};
-
-let isolatedWorldIds = IsolatedWorldIDs.ISOLATED_WORLD_EXTENSIONS;
-const extensionWorldId: {[key: string]: number | undefined} = {};
-
-// https://cs.chromium.org/chromium/src/extensions/renderer/script_injection.cc?type=cs&sq=package:chromium&g=0&l=52
-const getIsolatedWorldIdForInstance = () => {
-  // TODO(samuelmaddock): allocate and cleanup IDs
-  return isolatedWorldIds++;
-};
-
-const escapePattern = function (pattern: string) {
-  return pattern.replace(/[\\^$+?.()|[\]{}]/g, '\\$&');
-};
-
-// Check whether pattern matches.
-// https://developer.chrome.com/extensions/match_patterns
-const matchesPattern = function (pattern: string) {
-  if (pattern === '<all_urls>') return true;
-  const regexp = new RegExp(`^${pattern.split('*').map(escapePattern).join('.*')}$`);
-  const url = `${location.protocol}//${location.host}${location.pathname}`;
-  return url.match(regexp);
-};
-
-// Run the code with chrome API integrated.
-const runContentScript = function (this: any, extensionId: string, url: string, code: string) {
-  // Assign unique world ID to each extension
-  const worldId = extensionWorldId[extensionId] ||
-    (extensionWorldId[extensionId] = getIsolatedWorldIdForInstance());
-
-  // store extension ID for content script to read in isolated world
-  v8Util.setHiddenValue(global, `extension-${worldId}`, extensionId);
-
-  webFrame.setIsolatedWorldInfo(worldId, {
-    name: `${extensionId} [${worldId}]`
-    // TODO(samuelmaddock): read `content_security_policy` from extension manifest
-    // csp: manifest.content_security_policy,
-  });
-
-  const sources = [{ code, url }];
-  return webFrame.executeJavaScriptInIsolatedWorld(worldId, sources);
-};
-
-const runAllContentScript = function (scripts: Array<Electron.InjectionBase>, extensionId: string) {
-  for (const { url, code } of scripts) {
-    runContentScript.call(window, extensionId, url, code);
-  }
-};
-
-const runStylesheet = function (this: any, url: string, code: string) {
-  webFrame.insertCSS(code);
-};
-
-const runAllStylesheet = function (css: Array<Electron.InjectionBase>) {
-  for (const { url, code } of css) {
-    runStylesheet.call(window, url, code);
-  }
-};
-
-// Run injected scripts.
-// https://developer.chrome.com/extensions/content_scripts
-const injectContentScript = function (extensionId: string, script: Electron.ContentScript) {
-  if (!process.isMainFrame && !script.allFrames) return;
-  if (!script.matches.some(matchesPattern)) return;
-
-  if (script.js) {
-    const fire = runAllContentScript.bind(window, script.js, extensionId);
-    if (script.runAt === 'document_start') {
-      process.once('document-start', fire);
-    } else if (script.runAt === 'document_end') {
-      process.once('document-end', fire);
-    } else {
-      document.addEventListener('DOMContentLoaded', fire);
-    }
-  }
-
-  if (script.css) {
-    const fire = runAllStylesheet.bind(window, script.css);
-    if (script.runAt === 'document_start') {
-      process.once('document-start', fire);
-    } else if (script.runAt === 'document_end') {
-      process.once('document-end', fire);
-    } else {
-      document.addEventListener('DOMContentLoaded', fire);
-    }
-  }
-};
-
-// Handle the request of chrome.tabs.executeJavaScript.
-ipcRendererUtils.handle('CHROME_TABS_EXECUTE_SCRIPT', function (
-  event: Electron.Event,
-  extensionId: string,
-  url: string,
-  code: string
-) {
-  return runContentScript.call(window, extensionId, url, code);
-});
-
-module.exports = (entries: Electron.ContentScriptEntry[]) => {
-  for (const entry of entries) {
-    if (entry.contentScripts) {
-      for (const script of entry.contentScripts) {
-        injectContentScript(entry.extensionId, script);
-      }
-    }
-  }
-};
--- a/lib/renderer/extensions/event.ts
+++ b/lib/renderer/extensions/event.ts
@@ -1,20 +0,0 @@
-export class Event {
-  private listeners: Function[] = []
-
-  addListener (callback: Function) {
-    this.listeners.push(callback);
-  }
-
-  removeListener (callback: Function) {
-    const index = this.listeners.indexOf(callback);
-    if (index !== -1) {
-      this.listeners.splice(index, 1);
-    }
-  }
-
-  emit (...args: any[]) {
-    for (const listener of this.listeners) {
-      listener(...args);
-    }
-  }
-}
--- a/lib/renderer/extensions/i18n.ts
+++ b/lib/renderer/extensions/i18n.ts
@@ -1,60 +0,0 @@
-// Implementation of chrome.i18n.getMessage
-// https://developer.chrome.com/extensions/i18n#method-getMessage
-//
-// Does not implement predefined messages:
-// https://developer.chrome.com/extensions/i18n#overview-predefined
-
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
-interface Placeholder {
-  content: string;
-  example?: string;
-}
-
-const getMessages = (extensionId: number) => {
-  try {
-    const data = ipcRendererUtils.invokeSync<string>('CHROME_GET_MESSAGES', extensionId);
-    return JSON.parse(data) || {};
-  } catch {
-    return {};
-  }
-};
-
-const replaceNumberedSubstitutions = (message: string, substitutions: string[]) => {
-  return message.replace(/\$(\d+)/, (_, number) => {
-    const index = parseInt(number, 10) - 1;
-    return substitutions[index] || '';
-  });
-};
-
-const replacePlaceholders = (message: string, placeholders: Record<string, Placeholder>, substitutions: string[] | string) => {
-  if (typeof substitutions === 'string') substitutions = [substitutions];
-  if (!Array.isArray(substitutions)) substitutions = [];
-
-  if (placeholders) {
-    Object.keys(placeholders).forEach((name: string) => {
-      let { content } = placeholders[name];
-      const substitutionsArray = Array.isArray(substitutions) ? substitutions : [];
-      content = replaceNumberedSubstitutions(content, substitutionsArray);
-      message = message.replace(new RegExp(`\\$${name}\\$`, 'gi'), content);
-    });
-  }
-
-  return replaceNumberedSubstitutions(message, substitutions);
-};
-
-const getMessage = (extensionId: number, messageName: string, substitutions: string[]) => {
-  const messages = getMessages(extensionId);
-  if (Object.prototype.hasOwnProperty.call(messages, messageName)) {
-    const { message, placeholders } = messages[messageName];
-    return replacePlaceholders(message, placeholders, substitutions);
-  }
-};
-
-exports.setup = (extensionId: number) => {
-  return {
-    getMessage (messageName: string, substitutions: string[]) {
-      return getMessage(extensionId, messageName, substitutions);
-    }
-  };
-};
--- a/lib/renderer/extensions/storage.ts
+++ b/lib/renderer/extensions/storage.ts
@@ -1,86 +0,0 @@
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-
-const getStorage = (storageType: string, extensionId: number, callback: Function) => {
-  if (typeof callback !== 'function') throw new TypeError('No callback provided');
-
-  ipcRendererInternal.invoke<string>('CHROME_STORAGE_READ', storageType, extensionId)
-    .then(data => {
-      if (data !== null) {
-        callback(JSON.parse(data));
-      } else {
-        // Disabled due to false positive in StandardJS
-        // eslint-disable-next-line standard/no-callback-literal
-        callback({});
-      }
-    });
-};
-
-const setStorage = (storageType: string, extensionId: number, storage: Record<string, any>, callback: Function) => {
-  const json = JSON.stringify(storage);
-  ipcRendererInternal.invoke('CHROME_STORAGE_WRITE', storageType, extensionId, json)
-    .then(() => {
-      if (callback) callback();
-    });
-};
-
-const getStorageManager = (storageType: string, extensionId: number) => {
-  return {
-    get (keys: string[], callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        if (keys == null) return callback(storage);
-
-        let defaults: Record<string, any> = {};
-        switch (typeof keys) {
-          case 'string':
-            keys = [keys];
-            break;
-          case 'object':
-            if (!Array.isArray(keys)) {
-              defaults = keys;
-              keys = Object.keys(keys);
-            }
-            break;
-        }
-
-        // Disabled due to false positive in StandardJS
-        // eslint-disable-next-line standard/no-callback-literal
-        if (keys.length === 0) return callback({});
-
-        const items: Record<string, any> = {};
-        keys.forEach((key: string) => {
-          let value = storage[key];
-          if (value == null) value = defaults[key];
-          items[key] = value;
-        });
-        callback(items);
-      });
-    },
-
-    set (items: Record<string, any>, callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        Object.keys(items).forEach(name => { storage[name] = items[name]; });
-        setStorage(storageType, extensionId, storage, callback);
-      });
-    },
-
-    remove (keys: string[], callback: Function) {
-      getStorage(storageType, extensionId, (storage: Record<string, any>) => {
-        if (!Array.isArray(keys)) keys = [keys];
-        keys.forEach((key: string) => {
-          delete storage[key];
-        });
-
-        setStorage(storageType, extensionId, storage, callback);
-      });
-    },
-
-    clear (callback: Function) {
-      setStorage(storageType, extensionId, {}, callback);
-    }
-  };
-};
-
-export const setup = (extensionId: number) => ({
-  sync: getStorageManager('sync', extensionId),
-  local: getStorageManager('local', extensionId)
-});
--- a/lib/renderer/extensions/web-navigation.ts
+++ b/lib/renderer/extensions/web-navigation.ts
@@ -1,19 +0,0 @@
-import { Event } from '@electron/internal/renderer/extensions/event';
-import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-
-class WebNavigation {
-  private onBeforeNavigate = new Event()
-  private onCompleted = new Event()
-
-  constructor () {
-    ipcRendererInternal.on('CHROME_WEBNAVIGATION_ONBEFORENAVIGATE', (event: Electron.IpcRendererEvent, details: any) => {
-      this.onBeforeNavigate.emit(details);
-    });
-
-    ipcRendererInternal.on('CHROME_WEBNAVIGATION_ONCOMPLETED', (event: Electron.IpcRendererEvent, details: any) => {
-      this.onCompleted.emit(details);
-    });
-  }
-}
-
-export const setup = () => new WebNavigation();
--- a/lib/renderer/ipc-renderer-internal-utils.ts
+++ b/lib/renderer/ipc-renderer-internal-utils.ts
@@ -3,7 +3,7 @@ import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-in
 type IPCHandler = (event: Electron.IpcRendererEvent, ...args: any[]) => any

 export const handle = function <T extends IPCHandler> (channel: string, handler: T) {
-  ipcRendererInternal.on(channel, async (event, requestId, ...args) => {
+  ipcRendererInternal.onMessageFromMain(channel, async (event, requestId, ...args) => {
    const replyChannel = `${channel}_RESPONSE_${requestId}`;
    try {
      event.sender.send(replyChannel, null, await handler(event, ...args));
--- a/lib/renderer/ipc-renderer-internal.ts
+++ b/lib/renderer/ipc-renderer-internal.ts
@@ -29,4 +29,27 @@ ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[])
  return result;
 };

+ipcRendererInternal.onMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
+  return ipcRendererInternal.on(channel, (event, ...args) => {
+    if (event.senderId !== 0) {
+      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
+      return;
+    }
+
+    listener(event, ...args);
+  });
+};
+
+ipcRendererInternal.onceMessageFromMain = function (channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void) {
+  return ipcRendererInternal.on(channel, function wrapper (event, ...args) {
+    if (event.senderId !== 0) {
+      console.error(`Message ${channel} sent by unexpected WebContents (${event.senderId})`);
+      return;
+    }
+
+    ipcRendererInternal.removeListener(channel, wrapper);
+    listener(event, ...args);
+  });
+};
+
 export { ipcRendererInternal };
--- a/lib/renderer/security-warnings.ts
+++ b/lib/renderer/security-warnings.ts
@@ -76,10 +76,11 @@ const isLocalhost = function () {
 *
 * @returns {boolean} Is a CSP with `unsafe-eval` set?
 */
-const isUnsafeEvalEnabled = function () {
-  return webFrame.executeJavaScript(`(${(() => {
+const isUnsafeEvalEnabled: () => Promise<boolean> = function () {
+  // Call _executeJavaScript to bypass the world-safe deprecation warning
+  return (webFrame as any)._executeJavaScript(`(${(() => {
    try {
-      new Function(''); // eslint-disable-line no-new,no-new-func
+      eval(window.trustedTypes.emptyScript); // eslint-disable-line no-eval
    } catch {
      return false;
    }
@@ -178,7 +179,7 @@ const warnAboutInsecureCSP = function () {

    console.warn('%cElectron Security Warning (Insecure Content-Security-Policy)',
      'font-weight: bold;', warning);
-  });
+  }).catch(() => {});
 };

 /**
--- a/lib/renderer/web-view/guest-view-internal.ts
+++ b/lib/renderer/web-view/guest-view-internal.ts
@@ -27,6 +27,7 @@ const WEB_VIEW_EVENTS: Record<string, Array<string>> = {
  'focus-change': ['focus', 'guestInstanceId'],
  close: [],
  crashed: [],
+  'render-process-gone': ['details'],
  'plugin-crashed': ['name', 'version'],
  destroyed: [],
  'page-title-updated': ['title', 'explicitSet'],
@@ -66,18 +67,18 @@ const dispatchEvent = function (
 };

 export function registerEvents (webView: WebViewImpl, viewInstanceId: number) {
-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
    webView.guestInstanceId = undefined;
    webView.reset();
    const domEvent = new Event('destroyed');
    webView.dispatchEvent(domEvent);
  });

-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
    dispatchEvent(webView, eventName, eventName, ...args);
  });

-  ipcRendererInternal.on(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
+  ipcRendererInternal.onMessageFromMain(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
    const domEvent = new Event('ipc-message') as IpcMessageEvent;
    domEvent.channel = channel;
    domEvent.args = args;
--- a/lib/renderer/web-view/web-view-attributes.ts
+++ b/lib/renderer/web-view/web-view-attributes.ts
@@ -17,7 +17,7 @@ interface MutationHandler {

 // Attribute objects.
 // Default implementation of a WebView attribute.
-class WebViewAttribute implements MutationHandler {
+export class WebViewAttribute implements MutationHandler {
  public value: any;
  public ignoreMutation = false;

@@ -78,7 +78,7 @@ class BooleanAttribute extends WebViewAttribute {
 }

 // Attribute representing the state of the storage partition.
-class PartitionAttribute extends WebViewAttribute {
+export class PartitionAttribute extends WebViewAttribute {
  public validPartitionId = true

  constructor (public webViewImpl: WebViewImpl) {
@@ -102,7 +102,7 @@ class PartitionAttribute extends WebViewAttribute {
 }

 // Attribute that handles the location and navigation of the webview.
-class SrcAttribute extends WebViewAttribute {
+export class SrcAttribute extends WebViewAttribute {
  public observer!: MutationObserver;

  constructor (public webViewImpl: WebViewImpl) {
@@ -168,7 +168,7 @@ class SrcAttribute extends WebViewAttribute {
  }

  public parse () {
-    if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
+    if (!this.webViewImpl.elementAttached || !(this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId || !this.getValue()) {
      return;
    }
    if (this.webViewImpl.guestInstanceId == null) {
@@ -182,12 +182,12 @@ class SrcAttribute extends WebViewAttribute {
    // Navigate to |this.src|.
    const opts: Record<string, string> = {};

-    const httpreferrer = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER].getValue();
+    const httpreferrer = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER)!.getValue();
    if (httpreferrer) {
      opts.httpReferrer = httpreferrer;
    }

-    const useragent = this.webViewImpl.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT].getValue();
+    const useragent = this.webViewImpl.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT)!.getValue();
    if (useragent) {
      opts.userAgent = useragent;
    }
@@ -274,19 +274,18 @@ class EnableRemoteModuleAttribute extends WebViewAttribute {

 // Sets up all of the webview attributes.
 WebViewImpl.prototype.setupWebViewAttributes = function () {
-  this.attributes = {};
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION] = new PartitionAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC] = new SrcAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE] = new EnableRemoteModuleAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES] = new DisableBlinkFeaturesAttribute(this);
-  this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES] = new WebPreferencesAttribute(this);
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION, new PartitionAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC, new SrcAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_HTTPREFERRER, new HttpReferrerAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_USERAGENT, new UserAgentAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATION, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_NODEINTEGRATIONINSUBFRAMES, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_PLUGINS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEWEBSECURITY, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, new BooleanAttribute(WEB_VIEW_CONSTANTS.ATTRIBUTE_ALLOWPOPUPS, this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_ENABLEREMOTEMODULE, new EnableRemoteModuleAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_PRELOAD, new PreloadAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_BLINKFEATURES, new BlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_DISABLEBLINKFEATURES, new DisableBlinkFeaturesAttribute(this));
+  this.attributes.set(WEB_VIEW_CONSTANTS.ATTRIBUTE_WEBPREFERENCES, new WebPreferencesAttribute(this));
 };
--- a/lib/renderer/web-view/web-view-constants.ts
+++ b/lib/renderer/web-view/web-view-constants.ts
@@ -16,9 +16,6 @@ export const enum WEB_VIEW_CONSTANTS {
  ATTRIBUTE_DISABLEBLINKFEATURES = 'disableblinkfeatures',
  ATTRIBUTE_WEBPREFERENCES = 'webpreferences',

-  // Internal attribute.
-  ATTRIBUTE_INTERNALINSTANCEID = 'internalinstanceid',
-
  // Error messages.
  ERROR_MSG_ALREADY_NAVIGATED = 'The object has already navigated, so its partition cannot be changed.',
  ERROR_MSG_CANNOT_INJECT_SCRIPT = '<webview> = ' + 'Script cannot be injected into content until the page has loaded.',
--- a/lib/renderer/web-view/web-view-element.ts
+++ b/lib/renderer/web-view/web-view-element.ts
@@ -10,6 +10,7 @@

 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { WebViewImpl as IWebViewImpl, webViewImplModule } from '@electron/internal/renderer/web-view/web-view-impl';
+import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';

 // Return a WebViewElement class that is defined in this context.
 const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof webViewImplModule) => {
@@ -49,7 +50,7 @@ const defineWebViewElement = (v8Util: NodeJS.V8UtilBinding, webViewImpl: typeof
      if (!internal.elementAttached) {
        guestViewInternal.registerEvents(internal, internal.viewInstanceId);
        internal.elementAttached = true;
-        internal.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].parse();
+        (internal.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC) as SrcAttribute).parse();
      }
    }

--- a/lib/renderer/web-view/web-view-impl.ts
+++ b/lib/renderer/web-view/web-view-impl.ts
@@ -5,6 +5,7 @@ import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-inte
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal';
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants';
 import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
+import type { WebViewAttribute, PartitionAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { deserialize } from '@electron/internal/common/type-utils';
 const { webFrame } = electron;

@@ -33,14 +34,16 @@ export class WebViewImpl {
  public internalElement: HTMLIFrameElement

  // Replaced in web-view-attributes
-  public attributes: Record<string, any> = {}
+  public attributes = new Map<string, WebViewAttribute>();
  public setupWebViewAttributes (): void {}

  constructor (public webviewNode: HTMLElement) {
    // Create internal iframe element.
    this.internalElement = this.createInternalElement();
    const shadowRoot = this.webviewNode.attachShadow({ mode: 'open' });
-    shadowRoot.innerHTML = '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>';
+    const style = shadowRoot.ownerDocument.createElement('style');
+    style.textContent = ':host { display: flex; }';
+    shadowRoot.appendChild(style);
    this.setupWebViewAttributes();
    this.viewInstanceId = getNextId();
    shadowRoot.appendChild(this.internalElement);
@@ -76,7 +79,7 @@ export class WebViewImpl {
    }

    this.beforeFirstNavigation = true;
-    this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].validPartitionId = true;
+    (this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION) as PartitionAttribute).validPartitionId = true;

    // Since attachment swaps a local frame for a remote frame, we need our
    // internal iframe element to be local again before we can reattach.
@@ -95,12 +98,12 @@ export class WebViewImpl {
  // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
  // details.
  handleWebviewAttributeMutation (attributeName: string, oldValue: any, newValue: any) {
-    if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
+    if (!this.attributes.has(attributeName) || this.attributes.get(attributeName)!.ignoreMutation) {
      return;
    }

    // Let the changed attribute handle its own mutation
-    this.attributes[attributeName].handleMutation(oldValue, newValue);
+    this.attributes.get(attributeName)!.handleMutation(oldValue, newValue);
  }

  onElementResize () {
@@ -149,7 +152,7 @@ export class WebViewImpl {
      // Touching the src attribute triggers a navigation. To avoid
      // triggering a page reload on every guest-initiated navigation,
      // we do not handle this mutation.
-      this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
+      this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC)!.setValueIgnoreMutation(newValue);
    }
  }

@@ -163,7 +166,7 @@ export class WebViewImpl {
  }

  onAttach (storagePartitionId: number) {
-    return this.attributes[WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION].setValue(storagePartitionId);
+    return this.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_PARTITION)!.setValue(storagePartitionId);
  }

  buildParams () {
@@ -172,10 +175,8 @@ export class WebViewImpl {
      userAgentOverride: this.userAgentOverride
    };

-    for (const attributeName in this.attributes) {
-      if (Object.prototype.hasOwnProperty.call(this.attributes, attributeName)) {
-        params[attributeName] = this.attributes[attributeName].getValue();
-      }
+    for (const [attributeName, attribute] of this.attributes) {
+      params[attributeName] = attribute.getValue();
    }

    return params;
--- a/lib/renderer/window-setup.ts
+++ b/lib/renderer/window-setup.ts
@@ -181,7 +181,7 @@ class BrowserWindowProxy {
    this.guestId = guestId;
    this._location = new LocationProxy(guestId);

-    ipcRendererInternal.once(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
+    ipcRendererInternal.onceMessageFromMain(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
      removeProxy(guestId);
      this.closed = true;
    });
@@ -281,7 +281,7 @@ export const windowSetup = (
  if (contextIsolationEnabled) internalContextBridge.overrideGlobalValueFromIsolatedWorld(['prompt'], window.prompt);

  if (!usesNativeWindowOpen || openerId != null) {
-    ipcRendererInternal.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
+    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (
      _event, sourceId: number, message: any, sourceOrigin: string
    ) {
      // Manually dispatch event instead of using postMessage because we also need to
@@ -336,7 +336,7 @@ export const windowSetup = (
    let cachedVisibilityState = isHiddenPage ? 'hidden' : 'visible';

    // Subscribe to visibilityState changes.
-    ipcRendererInternal.on('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
+    ipcRendererInternal.onMessageFromMain('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', function (_event, visibilityState: VisibilityState) {
      if (cachedVisibilityState !== visibilityState) {
        cachedVisibilityState = visibilityState;
        document.dispatchEvent(new Event('visibilitychange'));
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
  "name": "electron",
-  "version": "11.0.0-beta.8",
+  "version": "11.2.3",
  "repository": "https://github.com/electron/electron",
  "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
  "devDependencies": {
-    "@electron/docs-parser": "^0.9.1",
+    "@electron/docs-parser": "^0.10.0",
    "@electron/typescript-definitions": "^8.7.5",
+    "@octokit/auth-app": "^2.10.0",
    "@octokit/rest": "^18.0.3",
    "@primer/octicons": "^10.0.0",
    "@types/basic-auth": "^1.1.3",
--- a/patches/boringssl/expose_aes-cfb.patch
+++ b/patches/boringssl/expose_aes-cfb.patch
@@ -57,10 +57,10 @@ index 53cb9d2dc8f1962a70dc12b648d27c32be8aca4b..84af06fc56e4aa72d4d48801d7c037ad
   callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
   callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
 diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
-index d22a6c216a2afe29f9507c90a190a4c6992c06a5..0bde0af4b25fbc24ee479b0ffffa037481c71e53 100644
+index 31390a3f63a1e88d50c22fa8c0d3b53610ebda68..792ae8feaa53229e3f6f9130269b268f43ded8d6 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
-@@ -424,6 +424,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
+@@ -430,6 +430,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
 
 // EVP_aes_128_cfb128 is only available in decrepit.
 OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
--- a/patches/boringssl/expose_ripemd160.patch
+++ b/patches/boringssl/expose_ripemd160.patch
@@ -80,7 +80,7 @@ index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32
 +  callback(EVP_ripemd160(), "ripemd160", NULL, arg);
 }
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index 7b0ed06cb352718a972be875d03d7c7c89489701..7072457224af3a66d1862f0028cb0ae17847f237 100644
+index 8e398e8b87f199cf947e097cf99e175bfc9870da..6c0ce559681817cae3273a50e6533468f17177ee 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
@@ -89,6 +89,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512_256(void);
--- a/Show More
+++ b/Show More