Bump v10.0.0-nightly.20200408

build: strip local/dbg symbols, from Linux binaries (#22968 )
Non full stripping seems to be the cause of limited non-determinism. Employ similar default as macOS when stripping away symbols. --disacard-all Remove all local symbols (saving only global symbols). --strip-debug Remove the debugging symbol table entries (those created by the -g option to cc(1) and other compilers).
2026-04-10 03:01:51 -04:00 · 2020-04-08 08:32:12 -07:00 · 2020-04-08 11:29:14 -04:00 · 2020-04-07 20:41:14 -07:00 · 2020-04-07 20:40:32 -07:00 · 2020-04-07 18:31:40 -07:00
1326 changed files with 36657 additions and 67050 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,14 @@ parameters:
    type: boolean
    default: false

+  run-linux-publish:
+    type: boolean
+    default: false
+
+  run-macos-publish:
+    type: boolean
+    default: false
+
 # The config expects the following environment variables to be set:
 #  - "SLACK_WEBHOOK" Slack hook URL to send notifications.
 #
@@ -53,12 +61,16 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5
+    - image: electronjs/build:d09fd95029bd8c1c73069888231b29688ef385ed

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
  resource_class: medium

+machine-linux-xlarge: &machine-linux-xlarge
+  <<: *docker-image
+  resource_class: xlarge
+
 machine-linux-2xlarge: &machine-linux-2xlarge
  <<: *docker-image
  resource_class: 2xlarge+
@@ -127,7 +139,7 @@ env-enable-sccache: &env-enable-sccache

 env-send-slack-notifications: &env-send-slack-notifications
  NOTIFY_SLACK: true
-
+  
 env-global: &env-global
  ELECTRON_OUT_DIR: Default

@@ -165,6 +177,10 @@ env-32bit-release: &env-32bit-release
  # Set symbol level to 1 for 32 bit releases because of https://crbug.com/648948
  GN_BUILDFLAG_ARGS: 'symbol_level = 1'

+env-macos-build: &env-macos-build
+  # Disable pre-compiled headers to reduce out size, only useful for rebuilds
+  GN_BUILDFLAG_ARGS: 'enable_precompiled_headers = false'
+
 # Individual (shared) steps.
 step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
  run:
@@ -215,25 +231,7 @@ step-gclient-sync: &step-gclient-sync
          $GCLIENT_EXTRA_ARGS \
          "$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
-        fi
+        gclient sync --with_branch_heads --with_tags
      fi

 step-setup-env-for-build: &step-setup-env-for-build
@@ -305,13 +303,18 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
        sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
      fi

+# On macOS delete all .git directories under src/ expect for
+# third_party/angle/ because of build time generation of file
+# gen/angle/commit.h depends on third_party/angle/.git/HEAD
+# https://chromium-review.googlesource.com/c/angle/angle/+/2074924
+# TODO: maybe better to always leave out */.git/HEAD file for all targets ?
 step-delete-git-directories: &step-delete-git-directories
  run:
    name: Delete all .git directories under src on MacOS to free space
    command: |
      if [ "`uname`" == "Darwin" ]; then
        cd src
-        ( find . -type d -name ".git" ) | xargs rm -rf
+        ( find . -type d -name ".git" -not -path "./third_party/angle/*" ) | xargs rm -rf
      fi

 # On macOS the yarn install command during gclient sync was run on a linux
@@ -389,6 +392,12 @@ step-electron-build: &step-electron-build
    name: Electron build
    no_output_timeout: 30m
    command: |
+      # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
+      # to realize is not correct / should be rebuilt.  We delete it here so it is
+      # rebuilt
+      if [ "$TRIGGER_ARM_TEST" == "true" ]; then
+        rm -f src/out/Default/libffmpeg.so
+      fi
      cd src
      ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES

@@ -454,16 +463,37 @@ step-electron-dist-store: &step-electron-dist-store
    path: src/out/Default/dist.zip
    destination: dist.zip

+step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-gen
+  run:
+    name: chromedriver GN gen
+    command: |
+      cd src
+      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+        if [ "$USE_GOMA" == "true" ]; then
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        else
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        fi
+      fi
+
 step-electron-chromedriver-build: &step-electron-chromedriver-build
  run:
    name: Build chromedriver.zip
    command: |
      cd src
-      ninja -C out/Default chrome/test/chromedriver -j $NUMBER_OF_NINJA_PROCESSES
-      if [ "`uname`" == "Linux" ]; then
-        electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/out/Default/chromedriver
+      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+        export CHROMEDRIVER_DIR="out/chromedriver"
+      else
+        export CHROMEDRIVER_DIR="out/Default"
+      fi
+      ninja -C $CHROMEDRIVER_DIR electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES
+      if [ "`uname`" == "Linux" ]; then
+        electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/$CHROMEDRIVER_DIR/chromedriver
+      fi
+      ninja -C $CHROMEDRIVER_DIR electron:electron_chromedriver_zip
+      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+        cp out/chromedriver/chromedriver.zip out/Default
      fi
-      ninja -C out/Default electron:electron_chromedriver_zip

 step-electron-chromedriver-store: &step-electron-chromedriver-store
  store_artifacts:
@@ -494,6 +524,7 @@ step-electron-publish: &step-electron-publish
      if [ "`uname`" == "Darwin" ]; then
        rm -rf src/out/Default/obj
      fi
+
      cd src/electron
      if [ "$UPLOAD_TO_S3" == "1" ]; then
        echo 'Uploading Electron release distribution to S3'
@@ -510,6 +541,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
      # Build artifacts
      - src/out/Default/dist.zip
      - src/out/Default/mksnapshot.zip
+      - src/out/Default/chromedriver.zip
      - src/out/Default/shell_browser_ui_unittests
      - src/out/Default/gen/node_headers
      - src/out/ffmpeg/ffmpeg.zip
@@ -540,6 +572,13 @@ step-mksnapshot-unzip: &step-mksnapshot-unzip
      cd src/out/Default
      unzip -o mksnapshot.zip

+step-chromedriver-unzip: &step-chromedriver-unzip
+  run:
+    name: Unzip chromedriver.zip
+    command: |
+      cd src/out/Default
+      unzip -o chromedriver.zip
+
 step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
  run:
    name: ffmpeg GN gen
@@ -577,6 +616,13 @@ step-verify-mksnapshot: &step-verify-mksnapshot
      cd src
      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default

+step-verify-chromedriver: &step-verify-chromedriver
+  run:
+    name: Verify ChromeDriver
+    command: |
+      cd src
+      python electron/script/verify-chromedriver.py --source-root "$PWD" --build-dir out/Default
+
 step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
  run:
    name: Setup for headless testing
@@ -602,13 +648,12 @@ step-mksnapshot-build: &step-mksnapshot-build
    command: |
      cd src
      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+      gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
      if [ "`uname`" != "Darwin" ]; then
        if [ "$TARGET_ARCH" == "arm" ]; then
          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
-          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/v8_context_snapshot_generator
        elif [ "$TARGET_ARCH" == "arm64" ]; then
          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/mksnapshot
-          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/v8_context_snapshot_generator
        else
          electron/script/strip-binaries.py --file $PWD/out/Default/mksnapshot
          electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
@@ -616,6 +661,7 @@ step-mksnapshot-build: &step-mksnapshot-build
      fi
      if [ "$SKIP_DIST_ZIP" != "1" ]; then
        ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
+        (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
      fi

 step-mksnapshot-store: &step-mksnapshot-store
@@ -722,11 +768,16 @@ step-ninja-summary: &step-ninja-summary
    command: |
      python depot_tools/post_build_ninja_summary.py -C src/out/Default

+step-ninja-report: &step-ninja-report
+  store_artifacts:
+    path: src/out/Default/.ninja_log
+    destination: ninja_log
+
 # Checkout Steps
 step-generate-deps-hash: &step-generate-deps-hash
  run:
    name: Generate DEPS Hash
-    command: node src/electron/script/generate-deps-hash.js
+    command: node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target

 step-touch-sync-done: &step-touch-sync-done
  run:
@@ -754,6 +805,14 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
      - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}
    name: Conditionally restoring git cache

+step-restore-out-cache: &step-restore-out-cache
+  restore_cache:
+    paths:
+      - ./src/out/Default
+    keys:
+      - v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Restoring out cache
+
 step-set-git-cache-path: &step-set-git-cache-path
  run:
    name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -771,6 +830,13 @@ step-save-git-cache: &step-save-git-cache
    key: v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
    name: Persisting git cache

+step-save-out-cache: &step-save-out-cache
+  save_cache:
+    paths:
+      - ./src/out/Default
+    key: v7-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Persisting out cache
+
 step-run-electron-only-hooks: &step-run-electron-only-hooks
  run:
    name: Run Electron Only Hooks
@@ -779,7 +845,7 @@ step-run-electron-only-hooks: &step-run-electron-only-hooks
 step-generate-deps-hash-cleanly: &step-generate-deps-hash-cleanly
  run:
    name: Generate DEPS Hash
-    command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
+    command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target

 # Mark the sync as done for future cache saving
 step-mark-sync-done: &step-mark-sync-done
@@ -915,8 +981,6 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
    - *step-set-git-cache-path
    # This sync call only runs if .circle-sync-done is an EMPTY file
    - *step-gclient-sync
-    - store_artifacts:
-        path: patches
    - *step-save-git-cache
    # These next few steps reset Electron to the correct commit regardless of which cache was restored
    - run:
@@ -935,7 +999,6 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
          sudo chown -R $(id -u):$(id -g) /portal
          mv ./src /portal
    - *step-save-src-cache
-    - *step-save-brew-cache

 steps-electron-gn-check: &steps-electron-gn-check
  steps:
@@ -986,55 +1049,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    #Compile ts/js to verify doc change didn't break anything
    - *step-ts-compile

-steps-electron-build-for-publish: &steps-electron-build-for-publish
-  steps:
-    - *step-checkout-electron
-    - *step-depot-tools-get
-    - *step-depot-tools-add-to-path
-    - *step-restore-brew-cache
-    - *step-get-more-space-on-mac
-    - *step-gclient-sync
-    - *step-setup-env-for-build
-    - *step-delete-git-directories
-    - *step-minimize-workspace-size-from-checkout
-    - *step-gn-gen-default
-
-    # Electron app
-    - *step-electron-build
-    - *step-maybe-generate-breakpad-symbols
-    - *step-maybe-electron-dist-strip
-    - *step-electron-dist-build
-    - *step-electron-dist-store
-    - *step-maybe-zip-symbols
-    - *step-symbols-store
-
-    # mksnapshot
-    - *step-mksnapshot-build
-    - *step-mksnapshot-store
-
-    # chromedriver
-    - *step-electron-chromedriver-build
-    - *step-electron-chromedriver-store
-
-    # Node.js headers
-    - *step-nodejs-headers-build
-    - *step-nodejs-headers-store
-
-    # ffmpeg
-    - *step-ffmpeg-gn-gen
-    - *step-ffmpeg-build
-    - *step-ffmpeg-store
-
-    # hunspell
-    - *step-hunspell-build
-    - *step-hunspell-store
-
-    # typescript defs
-    - *step-maybe-generate-typescript-defs
-
-    # Publish
-    - *step-electron-publish
-
 steps-chromedriver-build: &steps-chromedriver-build
  steps:
    - attach_workspace:
@@ -1042,8 +1056,8 @@ steps-chromedriver-build: &steps-chromedriver-build
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
    - *step-fix-sync-on-mac
-    - *step-gn-gen-default

+    - *step-electron-maybe-chromedriver-gn-gen
    - *step-electron-chromedriver-build
    - *step-electron-chromedriver-store

@@ -1093,16 +1107,16 @@ steps-verify-ffmpeg: &steps-verify-ffmpeg
    - *step-verify-ffmpeg
    - *step-maybe-notify-slack-failure

-steps-verify-mksnapshot: &steps-verify-mksnapshot
+steps-verify-chromedriver: &steps-verify-chromedriver
  steps:
    - attach_workspace:
        at: .
    - *step-depot-tools-add-to-path
    - *step-electron-dist-unzip
-    - *step-mksnapshot-unzip
+    - *step-chromedriver-unzip
    - *step-setup-linux-for-headless-testing

-    - *step-verify-mksnapshot
+    - *step-verify-chromedriver
    - *step-maybe-notify-slack-failure

 steps-tests: &steps-tests
@@ -1113,6 +1127,7 @@ steps-tests: &steps-tests
    - *step-depot-tools-add-to-path
    - *step-electron-dist-unzip
    - *step-mksnapshot-unzip
+    - *step-chromedriver-unzip
    - *step-setup-linux-for-headless-testing
    - *step-restore-brew-cache
    - *step-fix-known-hosts-linux
@@ -1127,7 +1142,8 @@ steps-tests: &steps-tests
          ELECTRON_DISABLE_SECURITY_WARNINGS: 1
        command: |
          cd src
-          (cd electron && node script/yarn test -- --ci --enable-logging)
+          (cd electron && node script/yarn test --runners=main --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
+          (cd electron && node script/yarn test --runners=remote --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
    - run:
        name: Check test results existence
        command: |
@@ -1144,6 +1160,7 @@ steps-tests: &steps-tests
        path: src/junit

    - *step-verify-mksnapshot
+    - *step-verify-chromedriver

    - *step-maybe-notify-slack-failure

@@ -1241,6 +1258,9 @@ commands:
      build:
        type: boolean
        default: true
+      use-out-cache:
+        type: boolean
+        default: true
      restore-src-cache:
        type: boolean
        default: true
@@ -1255,6 +1275,7 @@ commands:
                at: .
      - *step-restore-brew-cache
      - *step-install-gnutar-on-mac
+      - *step-save-brew-cache
      - when:
          condition: << parameters.checkout-and-assume-cache >>
          steps:
@@ -1280,8 +1301,6 @@ commands:
            - *step-set-git-cache-path
            # This sync call only runs if .circle-sync-done is an EMPTY file
            - *step-gclient-sync
-            - store_artifacts:
-                path: patches
            # These next few steps reset Electron to the correct commit regardless of which cache was restored
            - when:
                condition: << parameters.preserve-vendor-dirs >>
@@ -1329,9 +1348,14 @@ commands:
            - *step-delete-git-directories

            # Electron app
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-restore-out-cache
            - *step-gn-gen-default
            - *step-electron-build
            - *step-ninja-summary
+            - *step-ninja-report
            - *step-maybe-electron-dist-strip
            - *step-electron-dist-build
            - *step-electron-dist-store
@@ -1352,6 +1376,11 @@ commands:
            - *step-maybe-cross-arch-snapshot
            - *step-maybe-cross-arch-snapshot-store

+            # chromedriver
+            - *step-electron-maybe-chromedriver-gn-gen
+            - *step-electron-chromedriver-build
+            - *step-electron-chromedriver-store
+
            # ffmpeg
            - *step-ffmpeg-gn-gen
            - *step-ffmpeg-build
@@ -1389,6 +1418,10 @@ commands:
                    # These files do not seem to like being in a cache, let us remove them
                    find . -type f -name '*_pkg_info' -delete
                  fi
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-save-out-cache

            # Trigger tests on arm hardware if needed
            - *step-maybe-trigger-arm-test
@@ -1442,6 +1475,7 @@ commands:
      - *step-mksnapshot-store

      # chromedriver
+      - *step-electron-maybe-chromedriver-gn-gen
      - *step-electron-chromedriver-build
      - *step-electron-chromedriver-store

@@ -1543,6 +1577,7 @@ jobs:
    environment:
      <<: *env-linux-2xlarge
      <<: *env-testing-build
+      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
    steps:
      - electron-build:
@@ -1558,6 +1593,7 @@ jobs:
    environment:
      <<: *env-linux-2xlarge
      <<: *env-testing-build
+      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    steps:
      - electron-build:
@@ -1571,14 +1607,15 @@ jobs:
    environment:
      <<: *env-linux-2xlarge
      <<: *env-testing-build
+      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    <<: *steps-checkout-and-save-cache

  # Layer 2: Builds.
  linux-x64-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-global
      <<: *env-testing-build
      <<: *env-ninja-status
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1586,6 +1623,7 @@ jobs:
      - electron-build:
          persist: true
          checkout: true
+          use-out-cache: false

  linux-x64-testing-no-run-as-node:
    <<: *machine-linux-2xlarge
@@ -1599,6 +1637,7 @@ jobs:
      - electron-build:
          persist: false
          checkout: true
+          use-out-cache: false

  linux-x64-testing-gn-check:
    <<: *machine-linux-medium
@@ -1636,12 +1675,27 @@ jobs:
      <<: *env-release-build
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true

-  linux-ia32-testing:
+  linux-x64-publish-skip-checkout:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false
+
+  linux-ia32-testing:
+    <<: *machine-linux-xlarge
+    environment:
+      <<: *env-global
      <<: *env-ia32
      <<: *env-testing-build
      <<: *env-ninja-status
@@ -1650,6 +1704,7 @@ jobs:
      - electron-build:
          persist: true
          checkout: true
+          use-out-cache: false

  linux-ia32-chromedriver:
    <<: *machine-linux-medium
@@ -1684,12 +1739,29 @@ jobs:
      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true

-  linux-arm-testing:
+  linux-ia32-publish-skip-checkout:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
+      <<: *env-ia32
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      <<: *env-32bit-release
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false
+
+  linux-arm-testing:
+    <<: *machine-linux-xlarge
+    environment:
+      <<: *env-global
      <<: *env-arm
      <<: *env-testing-build
      <<: *env-ninja-status
@@ -1699,6 +1771,7 @@ jobs:
      - electron-build:
          persist: false
          checkout: true
+          use-out-cache: false

  linux-arm-chromedriver:
    <<: *machine-linux-medium
@@ -1733,12 +1806,29 @@ jobs:
      <<: *env-32bit-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true

-  linux-arm64-testing:
+  linux-arm-publish-skip-checkout:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
+      <<: *env-arm
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      <<: *env-32bit-release
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false
+
+  linux-arm64-testing:
+    <<: *machine-linux-xlarge
+    environment:
+      <<: *env-global
      <<: *env-arm64
      <<: *env-testing-build
      <<: *env-ninja-status
@@ -1748,6 +1838,7 @@ jobs:
      - electron-build:
          persist: false
          checkout: true
+          use-out-cache: false

  linux-arm64-testing-gn-check:
    <<: *machine-linux-medium
@@ -1789,7 +1880,23 @@ jobs:
      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true
+
+  linux-arm64-publish-skip-checkout:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge-release
+      <<: *env-arm64
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false

  osx-testing:
    <<: *machine-mac-large
@@ -1797,6 +1904,7 @@ jobs:
      <<: *env-mac-large
      <<: *env-testing-build
      <<: *env-ninja-status
+      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    steps:
      - electron-build:
@@ -1842,7 +1950,22 @@ jobs:
      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true
+
+  osx-publish-skip-checkout:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large-release
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false

  mas-testing:
    <<: *machine-mac-large
@@ -1851,6 +1974,7 @@ jobs:
      <<: *env-mas
      <<: *env-testing-build
      <<: *env-ninja-status
+      <<: *env-macos-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    steps:
      - electron-build:
@@ -1867,14 +1991,6 @@ jobs:
      <<: *env-testing-build
    <<: *steps-electron-gn-check

-  mas-chromedriver:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-    <<: *steps-chromedriver-build
-
  mas-release:
    <<: *machine-mac-large
    environment:
@@ -1899,7 +2015,23 @@ jobs:
      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    <<: *steps-electron-build-for-publish
+    steps:
+      - electron-publish:  
+          attach: false
+          checkout: true
+
+  mas-publish-skip-checkout:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large-release
+      <<: *env-mas
+      <<: *env-release-build
+      <<: *env-enable-sccache
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+    steps:
+      - electron-publish:  
+          attach: true
+          checkout: false

  # Layer 3: Tests.
  linux-x64-unittests:
@@ -1943,6 +2075,7 @@ jobs:
      <<: *env-linux-medium
      <<: *env-headless-testing
      <<: *env-stack-dumping
+    parallelism: 3
    <<: *steps-tests

  linux-x64-testing-nan:
@@ -1977,14 +2110,6 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  linux-x64-verify-mksnapshot:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  linux-ia32-testing-tests:
    <<: *machine-linux-medium
    environment:
@@ -1992,6 +2117,7 @@ jobs:
      <<: *env-ia32
      <<: *env-headless-testing
      <<: *env-stack-dumping
+    parallelism: 3
    <<: *steps-tests

  linux-ia32-testing-nan:
@@ -2030,20 +2156,12 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  linux-ia32-verify-mksnapshot:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  osx-testing-tests:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
      <<: *env-stack-dumping
+    parallelism: 2
    <<: *steps-tests

  osx-release-tests:
@@ -2061,18 +2179,12 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  osx-verify-mksnapshot:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  mas-testing-tests:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
      <<: *env-stack-dumping
+    parallelism: 2
    <<: *steps-tests

  mas-release-tests:
@@ -2090,13 +2202,6 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  mas-verify-mksnapshot:
-    <<: *machine-mac
-    environment:
-      <<: *env-machine-mac
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  # Layer 4: Summary.
  linux-x64-release-summary:
    <<: *machine-linux-medium
@@ -2155,6 +2260,27 @@ workflows:
  # will need to be updated and there will most likely need to be changes to
  # sudowoodo

+  publish-linux:
+    when: << pipeline.parameters.run-linux-publish >>
+    jobs:
+    - linux-checkout
+    - linux-x64-publish-skip-checkout:
+        requires:
+          - linux-checkout
+        context: release-env
+    - linux-ia32-publish-skip-checkout:
+        requires:
+          - linux-checkout
+        context: release-env
+    - linux-arm-publish-skip-checkout:
+        requires:
+          - linux-checkout
+        context: release-env
+    - linux-arm64-publish-skip-checkout:
+        requires:
+          - linux-checkout
+        context: release-env
+
  publish-x64-linux:
    when: << pipeline.parameters.run-linux-x64-publish >>
    jobs:
@@ -2191,6 +2317,17 @@ workflows:
    - mas-publish:
        context: release-env

+  publish-macos:
+    when: << pipeline.parameters.run-macos-publish >>
+    jobs:
+    - mac-checkout
+    - osx-publish-skip-checkout:
+        requires:
+          - mac-checkout
+    - mas-publish-skip-checkout:
+        requires:
+          - mac-checkout
+
  lint:
    when: << pipeline.parameters.run-lint >>
    jobs:
@@ -2201,6 +2338,7 @@ workflows:
    jobs:
      - linux-checkout-fast
      - linux-checkout-and-save-cache
+
      - linux-x64-testing
      - linux-x64-testing-no-run-as-node
      - linux-x64-testing-gn-check:
@@ -2285,18 +2423,11 @@ workflows:
      - linux-x64-verify-ffmpeg:
          requires:
            - linux-x64-release
-      - linux-x64-verify-mksnapshot:
-          requires:
-            - linux-x64-release
-      - linux-x64-chromedriver:
-          requires:
-            - linux-checkout-fast
      - linux-x64-release-summary:
          requires:
            - linux-x64-release
            - linux-x64-release-tests
            - linux-x64-verify-ffmpeg
-            - linux-x64-chromedriver

      - linux-ia32-release
      - linux-ia32-release-tests:
@@ -2305,36 +2436,21 @@ workflows:
      - linux-ia32-verify-ffmpeg:
          requires:
            - linux-ia32-release
-      - linux-ia32-verify-mksnapshot:
-          requires:
-            - linux-ia32-release
-      - linux-ia32-chromedriver:
-          requires:
-            - linux-checkout-fast
      - linux-ia32-release-summary:
          requires:
            - linux-ia32-release
            - linux-ia32-release-tests
            - linux-ia32-verify-ffmpeg
-            - linux-ia32-chromedriver

      - linux-arm-release
-      - linux-arm-chromedriver:
-          requires:
-            - linux-checkout-fast
      - linux-arm-release-summary:
          requires:
            - linux-arm-release
-            - linux-arm-chromedriver

      - linux-arm64-release
-      - linux-arm64-chromedriver:
-          requires:
-            - linux-checkout-fast
      - linux-arm64-release-summary:
          requires:
            - linux-arm64-release
-            - linux-arm64-chromedriver

  nightly-mac-release-test:
    triggers:
@@ -2358,18 +2474,11 @@ workflows:
      - osx-verify-ffmpeg:
          requires:
            - osx-release
-      - osx-verify-mksnapshot:
-          requires:
-            - osx-release
-      - osx-chromedriver:
-          requires:
-            - mac-checkout-fast
      - osx-release-summary:
          requires:
          - osx-release
          - osx-release-tests
          - osx-verify-ffmpeg
-          - osx-chromedriver

      - mas-release:
          requires:
@@ -2380,18 +2489,11 @@ workflows:
      - mas-verify-ffmpeg:
          requires:
            - mas-release
-      - mas-verify-mksnapshot:
-          requires:
-            - mas-release
-      - mas-chromedriver:
-          requires:
-            - mac-checkout-fast
      - mas-release-summary:
          requires:
          - mas-release
          - mas-release-tests
          - mas-verify-ffmpeg
-          - mas-chromedriver

  # Various slow and non-essential checks we run only nightly.
  # Sanitizer jobs should be added here.
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,18 +19,29 @@
    "prefer-const": ["error", {
      "destructuring": "all"
    }],
+    "standard/no-callback-literal": "off",
    "node/no-deprecated-api": 0
  },
  "parserOptions": {
    "ecmaVersion": 6,
    "sourceType": "module"
  },
+  "globals": {
+    "standardScheme": "readonly"
+  },
  "overrides": [
    {
      "files": "*.js",
      "rules": {
          "@typescript-eslint/no-unused-vars": "off"
      }
+    },
+    {
+      "files": "*.d.ts",
+      "rules": {
+          "no-useless-constructor": "off",
+          "@typescript-eslint/no-unused-vars": "off"
+      }
    }
  ]
 }
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,13 +2,3 @@
 # files to be checked out with LF endings even if core.autocrlf is true.
 *.patch text eol=lf
 patches/**/.patches merge=union
-
-# Source code and markdown files should always use LF as line ending.
-*.cc text eol=lf
-*.mm text eol=lf
-*.h text eol=lf
-*.js text eol=lf
-*.ts text eol=lf
-*.py text eol=lf
-*.ps1 text eol=lf
-*.md text eol=lf
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,20 +3,10 @@
 # https://help.github.com/articles/about-codeowners
 # https://git-scm.com/docs/gitignore

-# Most stuff in here is owned by the Community & Safety WG...
-/.github/*                              @electron/wg-community
-
-# ...except the Admin WG maintains this file.
-/.github/CODEOWNERS                     @electron/wg-admin
-
 # Upgrades WG
 /patches/                               @electron/wg-upgrades
 DEPS                                    @electron/wg-upgrades

-# Docs & Tooling WG
-/default_app/ @electron/wg-docs-tools
-/docs/                                  @electron/wg-docs-tools
-
 # Releases WG
 /npm/                                   @electron/wg-releases
-/script/release                         @electron/wg-releases
+/script/release                         @electron/wg-releases
--- a/.github/ISSUE_TEMPLATE/security_report.md
+++ b/.github/ISSUE_TEMPLATE/security_report.md
@@ -1,10 +0,0 @@
---
-name: Security report
-about: Do not create an issue for security reports, send an email to security@electronjs.org
-
---
-
-### Notice 
-
-**DO NOT** create an issue for security reports.
-Send an email to: **security@electronjs.org**.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,4 +18,4 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN

 #### Release Notes

-Notes: <!-- Please add a one-line description for app developers to read in the release notes, or `no-notes` if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
+Notes: <!-- Please add a one-line description for app developers to read in the release notes, or 'none' if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -33,6 +33,7 @@ authorizedUsers:
  - codebytere
  - deepak1556
  - jkleinsc
+  - loc
  - MarshallOfSound
  - miniak
  - nornagon
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ ts-gen

 # Used to accelerate CI builds
 .depshash
+.depshash-target
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,6 +4,7 @@ import("//build/config/win/manifest.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//content/public/app/mac_helpers.gni")
 import("//pdf/features.gni")
+import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -78,15 +79,11 @@ npm_action("build_electron_definitions") {
  args = [ rebase_path("$target_gen_dir/tsc/typings/electron.d.ts") ]
  inputs = auto_filenames.api_docs + [ "yarn.lock" ]

-  outputs = [
-    "$target_gen_dir/tsc/typings/electron.d.ts",
-  ]
+  outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
 }

 webpack_build("electron_browser_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.browser_bundle_deps

@@ -95,9 +92,7 @@ webpack_build("electron_browser_bundle") {
 }

 webpack_build("electron_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.renderer_bundle_deps

@@ -106,9 +101,7 @@ webpack_build("electron_renderer_bundle") {
 }

 webpack_build("electron_worker_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.worker_bundle_deps

@@ -117,9 +110,7 @@ webpack_build("electron_worker_bundle") {
 }

 webpack_build("electron_sandboxed_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.sandbox_bundle_deps

@@ -128,9 +119,7 @@ webpack_build("electron_sandboxed_renderer_bundle") {
 }

 webpack_build("electron_isolated_renderer_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.isolated_bundle_deps

@@ -139,9 +128,7 @@ webpack_build("electron_isolated_renderer_bundle") {
 }

 webpack_build("electron_content_script_bundle") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.content_script_bundle_deps

@@ -154,9 +141,7 @@ copy("electron_js2c_copy") {
    "lib/common/asar.js",
    "lib/common/asar_init.js",
  ]
-  outputs = [
-    "$target_gen_dir/js2c/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
 }

 action("electron_js2c") {
@@ -172,11 +157,11 @@ action("electron_js2c") {

  webpack_sources = [
    "$target_gen_dir/js2c/browser_init.js",
-    "$target_gen_dir/js2c/renderer_init.js",
-    "$target_gen_dir/js2c/worker_init.js",
    "$target_gen_dir/js2c/content_script_bundle.js",
    "$target_gen_dir/js2c/isolated_bundle.js",
+    "$target_gen_dir/js2c/renderer_init.js",
    "$target_gen_dir/js2c/sandbox_bundle.js",
+    "$target_gen_dir/js2c/worker_init.js",
  ]

  sources = webpack_sources + [
@@ -185,9 +170,7 @@ action("electron_js2c") {
            ]

  inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
-  outputs = [
-    "$root_gen_dir/electron_natives.cc",
-  ]
+  outputs = [ "$root_gen_dir/electron_natives.cc" ]

  script = "tools/js2c.py"
  args = [ rebase_path("//third_party/electron_node") ] +
@@ -198,9 +181,7 @@ action("electron_js2c") {
 target_gen_default_app_js = "$target_gen_dir/js/default_app"

 typescript_build("default_app_js") {
-  deps = [
-    ":build_electron_definitions",
-  ]
+  deps = [ ":build_electron_definitions" ]
  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")

  sources = filenames.default_app_ts_sources
@@ -212,16 +193,12 @@ typescript_build("default_app_js") {

 copy("default_app_static") {
  sources = filenames.default_app_static_sources
-  outputs = [
-    "$target_gen_default_app_js/{{source}}",
-  ]
+  outputs = [ "$target_gen_default_app_js/{{source}}" ]
 }

 copy("default_app_octicon_deps") {
  sources = filenames.default_app_octicon_sources
-  outputs = [
-    "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_default_app_js/electron/default_app/octicon/{{source_file_part}}" ]
 }

 asar("default_app_asar") {
@@ -235,9 +212,7 @@ asar("default_app_asar") {
  sources = get_target_outputs(":default_app_js") +
            get_target_outputs(":default_app_static") +
            get_target_outputs(":default_app_octicon_deps")
-  outputs = [
-    "$root_out_dir/resources/default_app.asar",
-  ]
+  outputs = [ "$root_out_dir/resources/default_app.asar" ]
 }

 grit("resources") {
@@ -249,26 +224,19 @@ grit("resources") {
  ]

  # Mojo manifest overlays are generated.
-  source_is_generated = true
  grit_flags = [
    "-E",
    "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
  ]

-  deps = [
-    ":copy_shell_devtools_discovery_page",
-  ]
+  deps = [ ":copy_shell_devtools_discovery_page" ]

  output_dir = "$target_gen_dir"
 }

 copy("copy_shell_devtools_discovery_page") {
-  sources = [
-    "//content/shell/resources/shell_devtools_discovery_page.html",
-  ]
-  outputs = [
-    "$target_gen_dir/shell_devtools_discovery_page.html",
-  ]
+  sources = [ "//content/shell/resources/shell_devtools_discovery_page.html" ]
+  outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
 }

 if (is_linux) {
@@ -314,9 +282,7 @@ source_set("manifests") {
 npm_action("electron_version_args") {
  script = "generate-version-json"

-  outputs = [
-    "$target_gen_dir/electron_version.args",
-  ]
+  outputs = [ "$target_gen_dir/electron_version.args" ]

  args = rebase_path(outputs)

@@ -327,9 +293,7 @@ npm_action("electron_version_args") {
 }

 templated_file("electron_version_header") {
-  deps = [
-    ":electron_version_args",
-  ]
+  deps = [ ":electron_version_args" ]

  template = "build/templates/electron_version.tmpl"
  output = "$target_gen_dir/electron_version.h"
@@ -354,11 +318,9 @@ source_set("electron_lib") {
    "buildflags",
    "chromium_src:chrome",
    "chromium_src:chrome_spellchecker",
-    "native_mate",
    "shell/common/api:mojo",
    "//base:base_static",
    "//base/allocator:buildflags",
-    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
    "//chrome/services/printing/public/mojom",
    "//components/certificate_transparency",
@@ -531,7 +493,7 @@ source_set("electron_lib") {
    deps += [
      ":libnotify_loader",
      "//build/config/linux/gtk",
-      "//chrome/browser/ui/libgtkui",
+      "//chrome/browser/ui/gtk",
      "//dbus",
      "//device/bluetooth",
      "//third_party/breakpad:client",
@@ -550,16 +512,6 @@ source_set("electron_lib") {

    sources += filenames.lib_sources_nss
    sources += [
-      "shell/browser/ui/gtk/app_indicator_icon.cc",
-      "shell/browser/ui/gtk/app_indicator_icon.h",
-      "shell/browser/ui/gtk/app_indicator_icon_menu.cc",
-      "shell/browser/ui/gtk/app_indicator_icon_menu.h",
-      "shell/browser/ui/gtk/gtk_status_icon.cc",
-      "shell/browser/ui/gtk/gtk_status_icon.h",
-      "shell/browser/ui/gtk/menu_util.cc",
-      "shell/browser/ui/gtk/menu_util.h",
-      "shell/browser/ui/gtk/status_icon.cc",
-      "shell/browser/ui/gtk/status_icon.h",
      "shell/browser/ui/gtk_util.cc",
      "shell/browser/ui/gtk_util.h",
    ]
@@ -586,8 +538,12 @@ source_set("electron_lib") {
    deps += [ "//third_party/crashpad/crashpad/client" ]
  }

-  if (enable_pdf) {
-    deps += [ "//pdf" ]
+  if (enable_plugins) {
+    deps += [ "chromium_src:plugins" ]
+    sources += [
+      "shell/renderer/pepper_helper.cc",
+      "shell/renderer/pepper_helper.h",
+    ]
  }

  if (enable_run_as_node) {
@@ -643,22 +599,10 @@ source_set("electron_lib") {
    ]
  }

-  if (enable_view_api) {
+  if (enable_views_api) {
    sources += [
-      "shell/browser/api/views/electron_api_box_layout.cc",
-      "shell/browser/api/views/electron_api_box_layout.h",
-      "shell/browser/api/views/electron_api_button.cc",
-      "shell/browser/api/views/electron_api_button.h",
-      "shell/browser/api/views/electron_api_label_button.cc",
-      "shell/browser/api/views/electron_api_label_button.h",
-      "shell/browser/api/views/electron_api_layout_manager.cc",
-      "shell/browser/api/views/electron_api_layout_manager.h",
-      "shell/browser/api/views/electron_api_md_text_button.cc",
-      "shell/browser/api/views/electron_api_md_text_button.h",
-      "shell/browser/api/views/electron_api_resize_area.cc",
-      "shell/browser/api/views/electron_api_resize_area.h",
-      "shell/browser/api/views/electron_api_text_field.cc",
-      "shell/browser/api/views/electron_api_text_field.h",
+      "shell/browser/api/views/electron_api_image_view.cc",
+      "shell/browser/api/views/electron_api_image_view.h",
    ]
  }

@@ -669,13 +613,9 @@ 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" ]
  }

-  if (enable_pepper_flash) {
-    deps += [ "components/pepper_flash" ]
-  }
-
-  public_deps += [ "shell/common/extensions/api:extensions_features" ]
  deps += [
    "//components/pref_registry",
    "//components/user_prefs",
@@ -687,6 +627,32 @@ source_set("electron_lib") {
  ]
  if (enable_electron_extensions) {
    sources += filenames.lib_sources_extensions
+    deps += [
+      "shell/browser/extensions/api:api_registration",
+      "shell/common/extensions/api",
+      "shell/common/extensions/api:extensions_features",
+      "//chrome/browser/resources:component_extension_resources",
+      "//components/zoom",
+    ]
+  }
+
+  if (enable_pdf) {
+    # Printing depends on some //pdf code, so it needs to be built even if the
+    # pdf viewer isn't enabled.
+    deps += [
+      "//pdf",
+      "//pdf:features",
+    ]
+  }
+  if (enable_pdf_viewer) {
+    deps += [
+      "//components/pdf/browser",
+      "//components/pdf/renderer",
+    ]
+    sources += [
+      "shell/browser/electron_pdf_web_contents_helper_client.cc",
+      "shell/browser/electron_pdf_web_contents_helper_client.h",
+    ]
  }
 }

@@ -707,15 +673,11 @@ if (is_mac) {
  electron_version = read_file("ELECTRON_VERSION", "trim string")

  mac_xib_bundle_data("electron_xibs") {
-    sources = [
-      "shell/common/resources/mac/MainMenu.xib",
-    ]
+    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
  }

  bundle_data("electron_framework_resources") {
-    public_deps = [
-      ":packed_resources",
-    ]
+    public_deps = [ ":packed_resources" ]
    sources = []
    if (icu_use_data_file) {
      sources += [ "$root_out_dir/icudtl.dat" ]
@@ -730,22 +692,16 @@ if (is_mac) {
        sources += [ "$root_out_dir/snapshot_blob.bin" ]
      }
    }
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
  }

-  if (!is_component_build) {
+  if (!is_component_build && is_component_ffmpeg) {
    bundle_data("electron_framework_libraries") {
      sources = []
      public_deps = []
-      if (is_component_ffmpeg) {
-        sources += [ "$root_out_dir/libffmpeg.dylib" ]
-        public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
-      }
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
+      sources += [ "$root_out_dir/libffmpeg.dylib" ]
+      public_deps += [ "//third_party/ffmpeg:ffmpeg" ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
    }
  } else {
    group("electron_framework_libraries") {
@@ -758,12 +714,8 @@ if (is_mac) {
        "$root_out_dir/egl_intermediates/libEGL.dylib",
        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
      ]
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
-      public_deps = [
-        "//ui/gl:angle_library_copy",
-      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:angle_library_copy" ]
    }

    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
@@ -771,43 +723,34 @@ if (is_mac) {
      sources = [
        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
+        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
+        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
      ]
-      outputs = [
-        "{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
-      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
      public_deps = [
-        "//ui/gl:swiftshader_library_copy",
+        "//ui/gl:swiftshader_egl_library_copy",
+        "//ui/gl:swiftshader_vk_library_copy",
      ]
    }
  }
  group("electron_angle_library") {
    if (use_egl) {
-      deps = [
-        ":electron_angle_binaries",
-      ]
+      deps = [ ":electron_angle_binaries" ]
    }
  }

  group("electron_swiftshader_library") {
    if (use_egl) {
-      deps = [
-        ":electron_swiftshader_binaries",
-      ]
+      deps = [ ":electron_swiftshader_binaries" ]
    }
  }

  bundle_data("electron_crashpad_helper") {
-    sources = [
-      "$root_out_dir/crashpad_handler",
-    ]
+    sources = [ "$root_out_dir/crashpad_handler" ]

-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]

-    public_deps = [
-      "//third_party/crashpad/crashpad/handler:crashpad_handler",
-    ]
+    public_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
  }

  mac_framework_bundle("electron_framework") {
@@ -866,9 +809,7 @@ if (is_mac) {
      assert(defined(invoker.helper_name_suffix))

      output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-      ]
+      deps = [ ":electron_framework+link" ]
      if (!is_mas_build) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
@@ -902,9 +843,7 @@ if (is_mac) {
  }

  bundle_data("electron_app_framework_bundle_data") {
-    sources = [
-      "$root_out_dir/$electron_framework_name.framework",
-    ]
+    sources = [ "$root_out_dir/$electron_framework_name.framework" ]
    if (!is_mas_build) {
      sources += [
        "external_binaries/Mantle.framework",
@@ -912,12 +851,8 @@ if (is_mac) {
        "external_binaries/Squirrel.framework",
      ]
    }
-    outputs = [
-      "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}",
-    ]
-    public_deps = [
-      ":electron_framework+link",
-    ]
+    outputs = [ "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}" ]
+    public_deps = [ ":electron_framework+link" ]

    foreach(helper_params, content_mac_helpers) {
      sources +=
@@ -937,15 +872,10 @@ if (is_mac) {
  }

  bundle_data("electron_login_helper_app") {
-    public_deps = [
-      ":electron_login_helper",
-    ]
-    sources = [
-      "$root_out_dir/$electron_login_helper_name.app",
-    ]
-    outputs = [
-      "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}",
-    ]
+    public_deps = [ ":electron_login_helper" ]
+    sources = [ "$root_out_dir/$electron_login_helper_name.app" ]
+    outputs =
+        [ "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}" ]
  }

  action("electron_app_lproj_dirs") {
@@ -960,15 +890,9 @@ if (is_mac) {

  foreach(locale, locales_as_mac_outputs) {
    bundle_data("electron_app_strings_${locale}_bundle_data") {
-      sources = [
-        "$target_gen_dir/app_infoplist_strings/$locale.lproj",
-      ]
-      outputs = [
-        "{{bundle_resources_dir}}/$locale.lproj",
-      ]
-      public_deps = [
-        ":electron_app_lproj_dirs",
-      ]
+      sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
+      outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
+      public_deps = [ ":electron_app_lproj_dirs" ]
    }
  }
  group("electron_app_strings_bundle_data") {
@@ -987,9 +911,7 @@ if (is_mac) {
      "$root_out_dir/resources/default_app.asar",
      "shell/browser/resources/mac/electron.icns",
    ]
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
  }

  mac_app_bundle("electron_app") {
@@ -1020,9 +942,7 @@ if (is_mac) {
      binary = "$root_out_dir/$electron_framework_name.framework/Versions/$electron_framework_version/$electron_framework_name"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/$electron_framework_name.dSYM/Contents/Resources/DWARF/$electron_framework_name"
-      deps = [
-        ":electron_framework",
-      ]
+      deps = [ ":electron_framework" ]
    }

    foreach(helper_params, content_mac_helpers) {
@@ -1033,9 +953,7 @@ if (is_mac) {
        binary = "$root_out_dir/$electron_helper_name${_helper_suffix}.app/Contents/MacOS/$electron_helper_name${_helper_suffix}"
        symbol_dir = "$root_out_dir/breakpad_symbols"
        dsym_file = "$root_out_dir/$electron_helper_name${_helper_suffix}.dSYM/Contents/Resources/DWARF/$electron_helper_name${_helper_suffix}"
-        deps = [
-          ":electron_helper_app_${_helper_target}",
-        ]
+        deps = [ ":electron_helper_app_${_helper_target}" ]
      }
    }

@@ -1043,18 +961,15 @@ if (is_mac) {
      binary = "$root_out_dir/$electron_product_name.app/Contents/MacOS/$electron_product_name"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/$electron_product_name.dSYM/Contents/Resources/DWARF/$electron_product_name"
-      deps = [
-        ":electron_app",
-      ]
+      deps = [ ":electron_app" ]
    }

    extract_symbols("swiftshader_egl_syms") {
      binary = "$root_out_dir/libswiftshader_libEGL.dylib"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
-      ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
    }

    extract_symbols("swiftshader_gles_syms") {
@@ -1070,9 +985,7 @@ if (is_mac) {
      binary = "$root_out_dir/crashpad_handler"
      symbol_dir = "$root_out_dir/breakpad_symbols"
      dsym_file = "$root_out_dir/crashpad_handler.dSYM/Contents/Resources/DWARF/crashpad_handler"
-      deps = [
-        "//third_party/crashpad/crashpad/handler:crashpad_handler",
-      ]
+      deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
    }

    group("electron_symbols") {
@@ -1133,9 +1046,7 @@ if (is_mac) {
      data += [ "$root_out_dir/resources/default_app.asar" ]
    }

-    public_deps = [
-      "//tools/v8_context_snapshot:v8_context_snapshot",
-    ]
+    public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]

    if (is_win) {
      sources += [
@@ -1192,17 +1103,14 @@ if (is_mac) {
    extract_symbols("electron_app_symbols") {
      binary = "$root_out_dir/$electron_project_name$_target_executable_suffix"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [
-        ":electron_app",
-      ]
+      deps = [ ":electron_app" ]
    }

    extract_symbols("swiftshader_egl_symbols") {
      binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
      symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
-      ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
    }

    extract_symbols("swiftshader_gles_symbols") {
@@ -1274,9 +1182,7 @@ template("dist_zip") {

  action(target_name) {
    script = "//electron/build/zip.py"
-    deps = [
-      ":$_runtime_deps_target",
-    ]
+    deps = [ ":$_runtime_deps_target" ]
    forward_variables_from(invoker,
                           [
                             "outputs",
@@ -1295,78 +1201,64 @@ template("dist_zip") {
 }

 copy("electron_license") {
-  sources = [
-    "LICENSE",
-  ]
-  outputs = [
-    "$root_build_dir/{{source_file_part}}",
-  ]
+  sources = [ "LICENSE" ]
+  outputs = [ "$root_build_dir/{{source_file_part}}" ]
 }
 copy("chromium_licenses") {
-  deps = [
-    "//components/resources:about_credits",
-  ]
-  sources = [
-    "$root_gen_dir/components/resources/about_credits.html",
-  ]
-  outputs = [
-    "$root_build_dir/LICENSES.chromium.html",
-  ]
+  deps = [ "//components/resources:about_credits" ]
+  sources = [ "$root_gen_dir/components/resources/about_credits.html" ]
+  outputs = [ "$root_build_dir/LICENSES.chromium.html" ]
 }

 group("licenses") {
  data_deps = [
-    ":electron_license",
    ":chromium_licenses",
+    ":electron_license",
  ]
 }

 copy("electron_version") {
-  sources = [
-    "ELECTRON_VERSION",
-  ]
-  outputs = [
-    "$root_build_dir/version",
-  ]
+  sources = [ "ELECTRON_VERSION" ]
+  outputs = [ "$root_build_dir/version" ]
 }

 dist_zip("electron_dist_zip") {
  data_deps = [
    ":electron_app",
-    ":licenses",
    ":electron_version",
+    ":licenses",
  ]
  if (is_linux) {
    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
  }
-  outputs = [
-    "$root_build_dir/dist.zip",
-  ]
+  outputs = [ "$root_build_dir/dist.zip" ]
 }

 dist_zip("electron_ffmpeg_zip") {
-  data_deps = [
-    "//third_party/ffmpeg",
-  ]
-  outputs = [
-    "$root_build_dir/ffmpeg.zip",
-  ]
+  data_deps = [ "//third_party/ffmpeg" ]
+  outputs = [ "$root_build_dir/ffmpeg.zip" ]
+}
+
+electron_chromedriver_deps = [
+  ":licenses",
+  "//chrome/test/chromedriver",
+  "//electron/buildflags",
+]
+
+group("electron_chromedriver") {
+  testonly = true
+  public_deps = electron_chromedriver_deps
 }

 dist_zip("electron_chromedriver_zip") {
  testonly = true
-  data_deps = [
-    "//chrome/test/chromedriver",
-    ":licenses",
-  ]
-  outputs = [
-    "$root_build_dir/chromedriver.zip",
-  ]
+  data_deps = electron_chromedriver_deps
+  outputs = [ "$root_build_dir/chromedriver.zip" ]
 }

 mksnapshot_deps = [
  ":licenses",
-  "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)",
+  "//tools/v8_context_snapshot:v8_context_snapshot_generator",
  "//v8:mksnapshot($v8_snapshot_toolchain)",
 ]

@@ -1376,31 +1268,21 @@ group("electron_mksnapshot") {

 dist_zip("electron_mksnapshot_zip") {
  data_deps = mksnapshot_deps
-  outputs = [
-    "$root_build_dir/mksnapshot.zip",
-  ]
+  outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }

 copy("hunspell_dictionaries") {
  sources = hunspell_dictionaries + hunspell_licenses
-  outputs = [
-    "$target_gen_dir/electron_hunspell/{{source_file_part}}",
-  ]
+  outputs = [ "$target_gen_dir/electron_hunspell/{{source_file_part}}" ]
 }

 dist_zip("hunspell_dictionaries_zip") {
-  data_deps = [
-    ":hunspell_dictionaries",
-  ]
+  data_deps = [ ":hunspell_dictionaries" ]
  flatten = true

-  outputs = [
-    "$root_build_dir/hunspell_dictionaries.zip",
-  ]
+  outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
 }

 group("electron") {
-  public_deps = [
-    ":electron_app",
-  ]
+  public_deps = [ ":electron_app" ]
 }
--- a/13
+++ b/13
@@ -6,16 +6,17 @@ gclient_gn_args = [
  'checkout_libaom',
  'checkout_nacl',
  'checkout_oculus_sdk',
-  'checkout_openxr'
+  'checkout_openxr',
+  'checkout_google_benchmark'
 ]

 vars = {
  'chromium_version':
-    '80.0.3987.163',
+    '0f55a0804ce1ba9678489174a6123358a7683f37',
  'node_version':
-    'v12.13.0',
+    'v12.16.1',
  'nan_version':
-    '2ee313aaca52e2b478965ac50eb5082520380d1b',
+    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',

  'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
  'pyyaml_version': '3.12',
@@ -69,6 +70,8 @@ vars = {
    False,
  'checkout_android_native_support':
    False,
+  'checkout_google_benchmark':
+    False,
 }

 deps = {
@@ -152,5 +155,3 @@ hooks = [
 recursedeps = [
  'src',
 ]
-
-# Touch DEPS to bust cache
--- a/50
+++ b/50
@@ -1,50 +0,0 @@
-FROM ubuntu:18.04
-
-RUN groupadd --gid 1000 builduser \
-  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
-
-# Set up TEMP directory
-ENV TEMP=/tmp
-RUN chmod a+rwx /tmp
-
-# Install Linux packages
-ADD build/install-build-deps.sh /setup/install-build-deps.sh
-RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
-RUN dpkg --add-architecture i386
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl \
-    libnotify-bin \
-    locales \
-    lsb-release \
-    nano \
-    python-dbus \
-    python-pip \
-    python-setuptools \
-    sudo \
-    vim-nox \
-    wget \
-    g++-multilib \
-    libgl1:i386 \
-  && /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Node.js
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
-  && rm -rf /var/lib/apt/lists/*
-
-# crcmod is required by gsutil, which is used for filling the gclient git cache
-RUN pip install -U crcmod
-
-# dbusmock is needed for Electron tests
-RUN pip install python-dbusmock
-
-RUN mkdir /tmp/workspace
-RUN chown builduser:builduser /tmp/workspace
-
-# Add xvfb init script
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-
-USER builduser
-WORKDIR /home/builduser
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -1,59 +0,0 @@
-FROM arm32v7/ubuntu:18.04
-
-RUN groupadd --gid 1000 builduser \
-  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
-
-# Set up TEMP directory
-ENV TEMP=/tmp
-RUN chmod a+rwx /tmp
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- bison \
- build-essential \
- clang \
- curl \
- gperf \
- git \
- libasound2 \
- libasound2-dev \
- libcap-dev \
- libcups2-dev \
- libdbus-1-dev \
- libgnome-keyring-dev \
- libgtk2.0-0 \
- libgtk2.0-dev \
- libgtk-3-0 \
- libgtk-3-dev \
- libnotify-bin \
- libnss3 \
- libnss3-dev \
- libxss1 \
- libxtst-dev \
- libxtst6 \
- lsb-release \
- locales \
- nano \
- python-setuptools \
- python-pip \
- python-dbusmock \
- sudo \
- unzip \
- wget \
- xvfb \
-&& rm -rf /var/lib/apt/lists/*
-
-# Install Node.js
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
-  && rm -rf /var/lib/apt/lists/*
-
-# crcmod is required by gsutil, which is used for filling the gclient git cache
-RUN pip install -U crcmod
-
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-
-RUN usermod -aG sudo builduser
-RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-WORKDIR /home/builduser
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -1,65 +0,0 @@
-FROM arm64v8/ubuntu:18.04
-
-RUN groupadd --gid 1000 builduser \
-  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
-
-# Set up TEMP directory
-ENV TEMP=/tmp
-RUN chmod a+rwx /tmp
-
-RUN dpkg --add-architecture armhf
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
- bison \
- build-essential \
- clang \
- curl \
- gperf \
- git \
- libasound2 \
- libasound2-dev \
- libc6:armhf \
- libcap-dev \
- libcups2-dev \
- libdbus-1-dev \
- libgnome-keyring-dev \
- libgtk2.0-0 \
- libgtk2.0-dev \
- libgtk-3-0 \
- libgtk-3-dev \
- libnotify-bin \
- libnss3 \
- libnss3-dev \
- libstdc++6:armhf \
- libxss1 \
- libxtst-dev \
- libxtst6 \
- lsb-release \
- locales \
- nano \
- python-setuptools \
- python-pip \
- sudo \
- unzip \
- wget \
- xvfb \
-&& rm -rf /var/lib/apt/lists/*
-
-# Install Node.js
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
-  && rm -rf /var/lib/apt/lists/*
-
-# crcmod is required by gsutil, which is used for filling the gclient git cache
-RUN pip install -U crcmod
-
-# dbusmock is needed for Electron tests
-RUN pip install python-dbusmock
-
-ADD tools/xvfb-init.sh /etc/init.d/xvfb
-RUN chmod a+x /etc/init.d/xvfb
-
-RUN usermod -aG sudo builduser
-RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-WORKDIR /home/builduser
--- a/2
+++ b/2
@@ -1 +1 @@
-8.5.4
+10.0.0-nightly.20200408
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 GitHub Inc.
+Copyright (c) 2013-2020 GitHub Inc.

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 # The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'debug', 'testing', 'release'}.
+#  - "GN_CONFIG" Build type. One of {'testing', 'release'}.
 #  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
 #      e.g. 'target_cpu="x86"' to build for a 32bit platform.
 #      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
@@ -28,8 +28,8 @@
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

 version: 1.0.{build}
-build_cloud: libcc-20
-image: vs2019-16.3-10.0.18362
+build_cloud: electron-16-core
+image: vs2019bt-16.4.0
 environment:
  GIT_CACHE_PATH: C:\Users\electron\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -53,9 +53,7 @@ build_script:
      } else {
        node script/yarn.js install --frozen-lockfile

-        $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) {
+        if ($(node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH;$LASTEXITCODE -eq 0)) {
          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
        }
      }
@@ -78,7 +76,39 @@ build_script:
      --unmanaged
      %GCLIENT_EXTRA_ARGS%
      "https://github.com/electron/electron"
-  - gclient sync --with_branch_heads --with_tags --ignore_locks --break_repo_locks
+  - ps: >-
+      if ($env:GN_CONFIG -eq 'release') {
+        $env:RUN_GCLIENT_SYNC="true"
+      } else {
+        cd src\electron
+        node script\generate-deps-hash.js
+        $depshash = Get-Content .\.depshash -Raw 
+        $zipfile = "Z:\$depshash.7z"
+        cd ..\..
+        if (Test-Path -Path $zipfile) {
+          # file exists, unzip and then gclient sync
+          7z x -y $zipfile -mmt=30 -aoa
+          if (-not (Test-Path -Path "src\buildtools")) {
+            # the zip file must be corrupt - resync
+            $env:RUN_GCLIENT_SYNC="true"
+            if ($env:TARGET_ARCH -ne 'ia32') {
+              # only save on x64/woa to avoid contention saving
+              $env:SAVE_GCLIENT_SRC="true"
+            }
+          } else {
+            # update external binaries
+            python src/electron/script/update-external-binaries.py
+          }
+        } else {    
+          # file does not exist, gclient sync, then zip
+          $env:RUN_GCLIENT_SYNC="true"
+          if ($env:TARGET_ARCH -ne 'ia32') {
+            # only save on x64/woa to avoid contention saving
+            $env:SAVE_GCLIENT_SRC="true"
+          }
+        }
+      }
+  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags --ignore_locks)
  - ps: >-
      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
        # archive current source for future use 
@@ -86,6 +116,12 @@ build_script:
        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)) {
          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.
+        # 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"
+        }
      }
  - ps: >-
      if ($env:GN_CONFIG -ne 'release') {
@@ -111,7 +147,7 @@ build_script:
  - gn check out/Default //electron:manifests
  - gn check out/Default //electron/shell/common/api:mojo
  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
-  - if "%GN_CONFIG%"=="testing" ( python C:\Users\electron\depot_tools\post_build_ninja_summary.py -C out\Default )
+  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
  - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
  - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
  - ninja -C out/Default electron:electron_dist_zip
@@ -121,6 +157,8 @@ build_script:
  - ninja -C out/Default electron:electron_chromedriver_zip
  - ninja -C out/Default third_party/electron_node:headers
  - if "%GN_CONFIG%"=="testing" ( python %LOCAL_GOMA_DIR%\goma_ctl.py stat )
+  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
  - appveyor PushArtifact out/Default/dist.zip
  - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
  - appveyor PushArtifact out/Default/chromedriver.zip
@@ -139,12 +177,12 @@ build_script:
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
        python electron\script\zip-symbols.py
-        appveyor PushArtifact out/Default/symbols.zip
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
      } else {
        # It's useful to have pdb files when debugging testing builds that are
        # built on CI.
        7z a pdb.zip out\Default\*.pdb
-        appveyor PushArtifact pdb.zip
+        appveyor-retry appveyor PushArtifact pdb.zip
      }
  - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
@@ -162,12 +200,15 @@ test_script:
        echo "Skipping tests for $env:GN_CONFIG build"
      }
  - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --ci --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --enable-logging)
  - 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"
+  - echo "About to verify mksnapshot"  
+  - if "%RUN_TESTS%"=="true" ( gn desc out\Default v8:run_mksnapshot_default args > out\Default\mksnapshot_args )
  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
  - echo "Done verifying mksnapshot"
+  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
+  - echo "Done verifying chromedriver"
 deploy_script:
  - cd electron
  - ps: >-
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -63,7 +63,7 @@ steps:
    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
    set npm_config_arch=arm64
    cd electron
-    node script/yarn test -- --ci --enable-logging --verbose
+    node script/yarn test -- --enable-logging --verbose
  displayName: 'Run Electron tests'
  env:
    ELECTRON_OUT_DIR: Default
@@ -88,6 +88,5 @@ steps:
 - powershell: |
    Get-Process | Where Name –Like "electron*" | Stop-Process
    Get-Process | Where Name –Like "MicrosoftEdge*" | Stop-Process
-    Get-Process | Where Name –Like "msedge*" | Stop-Process
  displayName: 'Kill processes left running from last test run'
-  condition: always()
+  condition: always()
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,18 +2,12 @@ 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 = 76
+node_module_version = 82

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"

-# TODO: this breaks native modules. See e.g. https://www.github.com/nodejs/node/pull/30463
-# We can probably enable this as long as we make sure node native modules
-# also build with the relevant #defines (V8_COMPRESS_POINTERS etc.)
-v8_enable_pointer_compression = false
-v8_enable_31bit_smis_on_64bit_arch = false
-
 # TODO: this breaks mksnapshot
 v8_enable_snapshot_native_code_counters = false

@@ -28,3 +22,5 @@ dawn_enable_vulkan_validation_layers = false
 is_cfi = false

 enable_osr = true
+
+enable_electron_extensions = true
--- a/build/args/debug.gn
+++ b/build/args/debug.gn
@@ -1,10 +0,0 @@
-import("all.gn")
-is_debug = true
-is_component_build = true
-
-# This may be guarded behind is_chrome_branded alongside
-# proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
-# explicitly override here to build OpenH264 encoder/FFmpeg decoder.
-# The initialization of the decoder depends on whether ffmpeg has
-# been built with H.264 support.
-rtc_use_h264 = proprietary_codecs
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -34,9 +34,7 @@ template("extract_symbols") {
      dump_syms_binary,
    ]
    stamp_file = "${target_gen_dir}/${target_name}.stamp"
-    outputs = [
-      stamp_file,
-    ]
+    outputs = [ stamp_file ]
    args = [
      "./" + rebase_path(dump_syms_binary, root_build_dir),
      rebase_path(invoker.binary, root_build_dir),
--- a/build/npm.gni
+++ b/build/npm.gni
@@ -10,9 +10,7 @@ template("npm_action") {
    ]
    script = "//electron/build/npm-run.py"

-    outputs = [
-      "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp",
-    ]
+    outputs = [ "$target_gen_dir/npm_pre_stamps/" + target_name + ".stamp" ]

    args = [
      "--silent",
--- a/build/profile_toolchain.py
+++ b/build/profile_toolchain.py
@@ -0,0 +1,98 @@
+from __future__ import with_statement
+import contextlib
+import sys
+import os
+import optparse
+import json
+
+sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
+
+import find_depot_tools
+from vs_toolchain import \
+    SetEnvironmentAndGetRuntimeDllDirs, \
+    SetEnvironmentAndGetSDKDir, \
+    GetVisualStudioVersion, \
+    NormalizePath
+
+sys.path.append("%s/win_toolchain" % find_depot_tools.add_depot_tools_to_path())
+
+from get_toolchain_if_necessary import CalculateHash
+
+
+@contextlib.contextmanager
+def cwd(dir):
+    curdir = os.getcwd()
+    try:
+        os.chdir(dir)
+        yield
+    finally:
+        os.chdir(curdir)
+
+
+def calculate_hash(root):
+    with cwd(root):
+        return CalculateHash('.', None)
+
+def windows_installed_software():
+    import win32com.client
+    strComputer = "."
+    objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
+    objSWbemServices = objWMIService.ConnectServer(strComputer, "root\cimv2")
+    colItems = objSWbemServices.ExecQuery("Select * from Win32_Product")
+    items = []
+
+    for objItem in colItems:
+        item = {}
+        if objItem.Caption:
+            item['caption'] = objItem.Caption
+        if objItem.Caption:
+            item['description'] = objItem.Description
+        if objItem.InstallDate:
+            item['install_date'] = objItem.InstallDate
+        if objItem.InstallDate2:
+            item['install_date_2'] = objItem.InstallDate2
+        if objItem.InstallLocation:
+            item['install_location'] = objItem.InstallLocation
+        if objItem.Name:
+            item['name'] = objItem.Name
+        if objItem.SKUNumber:
+            item['sku_number'] = objItem.SKUNumber
+        if objItem.Vendor:
+            item['vendor'] = objItem.Vendor
+        if objItem.Version:
+            item['version'] = objItem.Version
+        items.append(item)
+
+    return items
+
+
+def windows_profile():
+    runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
+    win_sdk_dir = SetEnvironmentAndGetSDKDir()
+    path = NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])
+
+    return {
+        'pwd': os.getcwd(), # since current windows executable are symbols path dependant, profile the current directory too
+        'installed_software': windows_installed_software(),
+        'sdks': [
+            {'name': 'vs', 'path': path, 'hash': calculate_hash(path)},
+            {'name': 'wsdk', 'path': win_sdk_dir, 'hash': calculate_hash(win_sdk_dir)}
+        ],
+        'runtime_lib_dirs': runtime_dll_dirs,
+    }
+
+
+def main(options):
+    if sys.platform == 'win32':
+        with open(options.output_json, 'wb') as f:
+            json.dump(windows_profile(), f)
+    else:
+        raise OSError("Unsupported OS")
+
+
+if __name__ == '__main__':
+  parser = optparse.OptionParser()
+  parser.add_option('--output-json', metavar='FILE', default='profile.json',
+                    help='write information about toolchain to FILE')
+  options, args = parser.parse_args()
+  sys.exit(main(options))
--- a/build/rules.gni
+++ b/build/rules.gni
@@ -81,9 +81,7 @@ template("mac_xib_bundle_data") {
                             "visibility",
                           ])

-    public_deps = [
-      ":$_compile_target_name",
-    ]
+    public_deps = [ ":$_compile_target_name" ]
    sources = get_target_outputs(":$_compile_target_name")

    _output_path = "{{bundle_resources_dir}}"
@@ -91,8 +89,6 @@ template("mac_xib_bundle_data") {
      _output_path = invoker.output_path
    }

-    outputs = [
-      "$_output_path/{{source_file_part}}",
-    ]
+    outputs = [ "$_output_path/{{source_file_part}}" ]
  }
 }
--- a/build/templated_file.gni
+++ b/build/templated_file.gni
@@ -15,12 +15,8 @@ template("templated_file") {
                             "inputs",
                             "outputs",
                           ])
-    inputs = [
-      invoker.template,
-    ]
-    outputs = [
-      invoker.output,
-    ]
+    inputs = [ invoker.template ]
+    outputs = [ invoker.output ]
    script = "//electron/build/generate-template.py"
    args = [
      rebase_path(invoker.template),
--- a/build/webpack/run-compiler.js
+++ b/build/webpack/run-compiler.js
@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path')
 const webpack = require('webpack')

@@ -10,9 +9,7 @@ config.output = {
  filename: path.basename(outPath)
 }

-const { wrapInitWithProfilingTimeout, wrapInitWithTryCatch, ...webpackConfig } = config;
-
-webpack(webpackConfig, (err, stats) => {
+webpack(config, (err, stats) => {
  if (err) {
    console.error(err)
    process.exit(1)
@@ -20,26 +17,6 @@ webpack(webpackConfig, (err, stats) => {
    console.error(stats.toString('normal'))
    process.exit(1)
  } else {
-    let contents = fs.readFileSync(outPath, 'utf8');
-    if (wrapInitWithTryCatch) {
-      contents = `try {
-${contents}
-} catch (err) {
-  console.error('Electron ${webpackConfig.output.filename} script failed to run');
-  console.error(err);
-}`;
-    }
-    if (wrapInitWithProfilingTimeout) {
-      contents = `function ___electron_webpack_init__() {
-${contents}
-};
-if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
-  setTimeout(___electron_webpack_init__, 0);
-} else {
-  ___electron_webpack_init__();
-}`;
-    }
-    fs.writeFileSync(outPath, contents)
    process.exit(0)
  }
 })
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -24,9 +24,7 @@ module.exports = ({
  alwaysHasNode,
  loadElectronFromAlternateTarget,
  targetDeletesNodeGlobals,
-  target,
-  wrapInitWithProfilingTimeout,
-  wrapInitWithTryCatch
+  target
 }) => {
  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts')
  if (!fs.existsSync(entry)) {
@@ -41,8 +39,6 @@ module.exports = ({
    output: {
      filename: `${target}.bundle.js`
    },
-    wrapInitWithProfilingTimeout,
-    wrapInitWithTryCatch,
    resolve: {
      alias: {
        '@electron/internal': path.resolve(electronRoot, 'lib'),
--- a/build/webpack/webpack.config.isolated_renderer.js
+++ b/build/webpack/webpack.config.isolated_renderer.js
@@ -1,5 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'isolated_renderer',
-  alwaysHasNode: false,
-  wrapInitWithTryCatch: true
+  alwaysHasNode: false
 })
--- a/build/webpack/webpack.config.renderer.js
+++ b/build/webpack/webpack.config.renderer.js
@@ -1,7 +1,5 @@
 module.exports = require('./webpack.config.base')({
  target: 'renderer',
  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
+  targetDeletesNodeGlobals: true
 })
--- a/build/webpack/webpack.config.sandboxed_renderer.js
+++ b/build/webpack/webpack.config.sandboxed_renderer.js
@@ -1,6 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'sandboxed_renderer',
-  alwaysHasNode: false,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
+  alwaysHasNode: false
 })
--- a/build/webpack/webpack.config.worker.js
+++ b/build/webpack/webpack.config.worker.js
@@ -2,6 +2,5 @@ module.exports = require('./webpack.config.base')({
  target: 'worker',
  loadElectronFromAlternateTarget: 'renderer',
  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true,
-  wrapInitWithTryCatch: true
+  targetDeletesNodeGlobals: true
 })
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -16,7 +16,6 @@ template("webpack_build") {
    inputs = [
               invoker.config_file,
               "//electron/build/webpack/webpack.config.base.js",
-               "//electron/build/webpack/run-compiler.js",
               "//electron/tsconfig.json",
               "//electron/yarn.lock",
               "//electron/typings/internal-ambient.d.ts",
@@ -28,8 +27,6 @@ template("webpack_build") {
      rebase_path(invoker.out_file),
    ]

-    outputs = [
-      invoker.out_file,
-    ]
+    outputs = [ invoker.out_file ]
  }
 }
--- a/build/zip.py
+++ b/build/zip.py
@@ -9,6 +9,7 @@ EXTENSIONS_TO_SKIP = [
  '.pdb',
  '.mojom.js',
  '.mojom-lite.js',
+  '.info'
 ]

 PATHS_TO_SKIP = [
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -13,7 +13,7 @@ buildflag_header("buildflags") {
    "ENABLE_RUN_AS_NODE=$enable_run_as_node",
    "ENABLE_OSR=$enable_osr",
    "ENABLE_REMOTE_MODULE=$enable_remote_module",
-    "ENABLE_VIEW_API=$enable_view_api",
+    "ENABLE_VIEWS_API=$enable_views_api",
    "ENABLE_PEPPER_FLASH=$enable_pepper_flash",
    "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
    "ENABLE_TTS=$enable_tts",
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -12,9 +12,9 @@ declare_args() {

  enable_remote_module = true

-  enable_view_api = false
+  enable_views_api = true

-  enable_pdf_viewer = false
+  enable_pdf_viewer = true

  enable_tts = true

--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -109,11 +109,15 @@ static_library("chrome") {
    ]

    if (use_aura) {
-      sources += [
-        "//chrome/browser/platform_util_aura.cc",
-        "//chrome/browser/ui/views/color_chooser_aura.cc",
-        "//chrome/browser/ui/views/color_chooser_aura.h",
-      ]
+      sources += [ "//chrome/browser/platform_util_aura.cc" ]
+
+      if (!is_win) {
+        sources += [
+          "//chrome/browser/ui/views/color_chooser_aura.cc",
+          "//chrome/browser/ui/views/color_chooser_aura.h",
+        ]
+      }
+
      deps += [ "//components/feature_engagement" ]
    }

@@ -184,9 +188,9 @@ static_library("chrome") {
      "//chrome/services/printing:lib",
      "//components/printing/browser",
      "//components/printing/renderer",
-      "//components/services/pdf_compositor",
-      "//components/services/pdf_compositor/public/cpp",
-      "//components/services/pdf_compositor/public/mojom",
+      "//components/services/print_compositor",
+      "//components/services/print_compositor/public/cpp",
+      "//components/services/print_compositor/public/mojom",
    ]

    deps += [
@@ -229,6 +233,102 @@ static_library("chrome") {
      "//components/vector_icons:vector_icons",
    ]
  }
+
+  if (enable_electron_extensions) {
+    sources += [
+      "//chrome/browser/extensions/chrome_url_request_util.cc",
+      "//chrome/browser/extensions/chrome_url_request_util.h",
+      "//chrome/browser/pdf/pdf_extension_util.cc",
+      "//chrome/browser/pdf/pdf_extension_util.h",
+      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc",
+      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h",
+      "//chrome/renderer/extensions/extension_hooks_delegate.cc",
+      "//chrome/renderer/extensions/extension_hooks_delegate.h",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.h",
+      "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
+      "//chrome/renderer/pepper/chrome_pdf_print_client.h",
+    ]
+  }
+}
+
+source_set("plugins") {
+  sources = []
+  deps = []
+  libs = []
+
+  # browser side
+  sources += [
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
+  ]
+  deps += [
+    "//components/pdf/browser",
+    "//media:media_buildflags",
+    "//ppapi/buildflags",
+    "//ppapi/proxy:ipc",
+    "//services/device/public/mojom",
+  ]
+  if (enable_pepper_flash) {
+    sources += [
+      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
+    ]
+    if (is_mac) {
+      sources += [
+        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
+        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
+      ]
+      libs += [ "CoreGraphics.framework" ]
+    }
+    if (is_linux) {
+      deps += [ "//components/services/font/public/cpp" ]
+    }
+  }
+
+  # renderer side
+  sources += [
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
+  ]
+  if (enable_pepper_flash) {
+    sources += [
+      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
+      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
+      "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_menu_host.h",
+      "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
+    ]
+  }
+  if (enable_pepper_flash || enable_pdf_viewer) {
+    sources += [
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
+    ]
+  }
+  deps += [
+    "//components/pdf/renderer",
+    "//components/strings",
+    "//media:media_buildflags",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/proxy:ipc",
+    "//ppapi/shared_impl",
+    "//skia",
+  ]
 }

 # This source set is just so we don't have to depend on all of //chrome/browser
@@ -255,6 +355,7 @@ source_set("chrome_spellchecker") {
      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
      "//chrome/browser/spellchecker/spellcheck_service.cc",
      "//chrome/browser/spellchecker/spellcheck_service.h",
+      "//chrome/common/pref_names.h",
    ]

    if (has_spellcheck_panel) {
--- a/chromium_src/chrome/browser/process_singleton_win.cc
+++ b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -197,7 +197,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    return PROCESS_NONE;
  }

-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
    case chrome::NOTIFY_SUCCESS:
      return PROCESS_NOTIFIED;
    case chrome::NOTIFY_FAILED:
--- a/components/pepper_flash/BUILD.gn
+++ b/components/pepper_flash/BUILD.gn
@@ -1,62 +0,0 @@
-# Copyright (c) 2018 GitHub, Inc.
-# Use of this source code is governed by the MIT license that can be
-# found in the LICENSE file.
-
-component("pepper_flash") {
-  visibility = [ "//electron:electron_lib" ]
-  defines = [ "IS_PEPPER_FLASH_IMPL" ]
-  sources = [
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
-    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
-    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
-    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
-    "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
-    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
-    "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_menu_host.h",
-    "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
-    "//chrome/renderer/pepper/pepper_helper.cc",
-    "//chrome/renderer/pepper/pepper_helper.h",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
-    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
-  ]
-  deps = [
-    "//content/public/browser",
-    "//content/public/renderer",
-    "//media:media_buildflags",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/proxy:ipc",
-    "//ppapi/shared_impl",
-    "//services/device/public/mojom",
-    "//skia",
-    "//third_party/adobe/flash:flapper_version_h",
-    "//ui/base",
-    "//ui/base/clipboard",
-  ]
-  if (is_mac) {
-    sources += [
-      "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
-      "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
-    ]
-    libs = [ "CoreGraphics.framework" ]
-  }
-  if (is_linux) {
-    deps += [ "//components/services/font/public/cpp" ]
-  }
-}
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -1,11 +1,8 @@
 import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron';
 import * as path from 'path';
-import * as url from 'url';

 let mainWindow: BrowserWindow | null = null;

-app.allowRendererProcessReuse = true;
-
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
  app.quit();
@@ -32,11 +29,12 @@ function isTrustedSender (webContents: Electron.WebContents) {
    return false;
  }

-  try {
-    return url.fileURLToPath(webContents.getURL()) === indexPath;
-  } catch {
-    return false;
-  }
+  const parsedUrl = new URL(webContents.getURL());
+  const urlPath = process.platform === 'win32'
+    // Strip the prefixed "/" that occurs on windows
+    ? path.resolve(parsedUrl.pathname.substr(1))
+    : parsedUrl.pathname;
+  return parsedUrl.protocol === 'file:' && urlPath === indexPath;
 }

 ipcMain.handle('bootstrap', (event) => {
@@ -47,10 +45,10 @@ async function createWindow () {
  await app.whenReady();

  const options: Electron.BrowserWindowConstructorOptions = {
-    width: 900,
-    height: 600,
+    width: 960,
+    height: 620,
    autoHideMenuBar: true,
-    backgroundColor: '#FFFFFF',
+    backgroundColor: '#2f3241',
    webPreferences: {
      preload: path.resolve(__dirname, 'preload.js'),
      contextIsolation: true,
--- a/default_app/styles.css
+++ b/default_app/styles.css
@@ -8,7 +8,7 @@ body {
 }

 .container {
-  margin: 15px 30px 30px 30px;
+  margin: 15px 30px;
  background-color: #2f3241;
  flex: 1;
  display: flex;
--- a/docs-translations/README.md
+++ b/docs-translations/README.md
@@ -1,33 +0,0 @@
-## Docs Translations
-
-This directory once contained unstructured translations of Electron's 
-documentation, but has been deprecated in favor of a new translation process 
-using [Crowdin], a GitHub-friendly platform for collaborative translation.
-
-For more details, visit the [electron/i18n] repo.
-
-## Contributing
-
-If you're interested in helping translate Electron's docs, visit 
-[Crowdin] and log in with your GitHub account. And thanks!
-
-## Offline Docs
-
-If you miss having access to Electron's raw markdown files in your preferred
-language, don't fret! You can still get raw docs, they're just in a 
-different place now. See [electron/i18n/tree/master/content]
-
-To more easily view and browse offline docs in your language, clone the repo and use [vmd], 
-an Electron-based GitHub-styled markdown viewer:
-
-```sh
-npm i -g vmd
-git clone https://github.com/electron/i18n
-vmd electron-i18n/content/zh-CN
-```
-
-[crowdin.com/project/electron]: https://crowdin.com/project/electron
-[Crowdin]: https://crowdin.com/project/electron
-[electron/i18n]: https://github.com/electron/i18n#readme
-[electron/i18n/tree/master/content]: https://github.com/electron/i18n/tree/master/content
-[vmd]: http://ghub.io/vmd
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,7 +18,6 @@ an issue:

 ## Guides and Tutorials

-* [About Electron](tutorial/about.md)
 * [Setting up the Development Environment](tutorial/development-environment.md)
  * [Setting up macOS](tutorial/development-environment.md#setting-up-macos)
  * [Setting up Windows](tutorial/development-environment.md#setting-up-windows)
@@ -39,6 +38,7 @@ an issue:
  * [Using Electron's APIs](tutorial/application-architecture.md#using-electron-apis)
  * [Using Node.js APIs](tutorial/application-architecture.md#using-nodejs-apis)
  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
+  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
  * [Notifications](tutorial/notifications.md)
  * [Recent Documents](tutorial/recent-documents.md)
@@ -52,6 +52,7 @@ an issue:
  * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
  * [Supporting macOS Dark Mode](tutorial/mojave-dark-mode-guide.md)
+  * [Web embeds in Electron](tutorial/web-embeds.md)
 * [Accessibility](tutorial/accessibility.md)
  * [Spectron](tutorial/accessibility.md#spectron)
  * [Devtron](tutorial/accessibility.md#devtron)
@@ -110,7 +111,8 @@ These individual tutorials expand on topics discussed in the guide above.
 * [Process Object](api/process.md)
 * [Supported Command Line Switches](api/command-line-switches.md)
 * [Environment Variables](api/environment-variables.md)
-* [Breaking API Changes](api/breaking-changes.md)
+* [Chrome Extensions Support](api/extensions.md)
+* [Breaking API Changes](breaking-changes.md)

 ### Custom DOM Elements:

--- a/docs/api/accelerator.md
+++ b/docs/api/accelerator.md
@@ -18,7 +18,7 @@ method, i.e.
 ```javascript
 const { app, globalShortcut } = require('electron')

-app.on('ready', () => {
+app.whenReady().then(() => {
  // Register a 'CommandOrControl+Y' shortcut listener.
  globalShortcut.register('CommandOrControl+Y', () => {
    // Do stuff when Y and either Command/Control is pressed.
@@ -54,7 +54,7 @@ The `Super` key is mapped to the `Windows` key on Windows and Linux and
 * `0` to `9`
 * `A` to `Z`
 * `F1` to `F24`
-* Punctuations like `~`, `!`, `@`, `#`, `$`, etc.
+* Punctuation like `~`, `!`, `@`, `#`, `$`, etc.
 * `Plus`
 * `Space`
 * `Tab`
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -34,10 +34,11 @@ Returns:

 * `launchInfo` unknown _macOS_

-Emitted when Electron has finished initializing. On macOS, `launchInfo` holds
-the `userInfo` of the `NSUserNotification` that was used to open the application,
-if it was launched from Notification Center. You can call `app.isReady()` to
-check if this event has already fired.
+Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
+holds the `userInfo` of the `NSUserNotification` that was used to open the
+application, if it was launched from Notification Center. You can also call
+`app.isReady()` to check if this event has already fired and `app.whenReady()`
+to get a Promise that is fulfilled when Electron is initialized.

 ### Event: 'window-all-closed'

@@ -74,7 +75,7 @@ Returns:
 * `event` Event

 Emitted when all windows have been closed and the application will quit.
-Calling `event.preventDefault()` will prevent the default behaviour, which is
+Calling `event.preventDefault()` will prevent the default behavior, which is
 terminating the application.

 See the description of the `window-all-closed` event for the differences between
@@ -203,7 +204,7 @@ Returns:
  [`NSUserActivity.activityType`][activity-type].
 * `userInfo` unknown - Contains app-specific state stored by the activity.

-Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActiviy()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.
+Emitted when [Handoff][handoff] is about to be resumed on another device. If you need to update the state to be transferred, you should call `event.preventDefault()` immediately, construct a new `userInfo` dictionary and call `app.updateCurrentActivity()` in a timely manner. Otherwise, the operation will fail and `continue-activity-error` will be called.

 ### Event: 'new-window-for-tab' _macOS_

@@ -368,25 +369,6 @@ Returns:

 Emitted when the renderer process of `webContents` crashes or is killed.

-#### Event: 'render-process-gone'
-
-Returns:
-
-* `event` Event
-* `webContents` [WebContents](web-contents.md)
-* `details` Object
-  * `reason` String - The reason the render process is gone.  Possible values:
-    * `clean-exit` - Process exited with an exit code of zero
-    * `abnormal-exit` - Process exited with a non-zero exit code
-    * `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
-    * `integrity-failure` - Windows code integrity checks failed
-
-Emitted when the renderer process unexpectedly dissapears.  This is normally
-because it was crashed or killed.
-
 ### Event: 'accessibility-support-changed' _macOS_ _Windows_

 Returns:
@@ -506,18 +488,6 @@ Emitted when `remote.getCurrentWebContents()` is called in the renderer process
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

-### Event: 'remote-get-guest-web-contents'
-
-Returns:
-
-* `event` Event
-* `webContents` [WebContents](web-contents.md)
-* `guestWebContents` [WebContents](web-contents.md)
-
-Emitted when `<webview>.getWebContents()` is called in the renderer process of `webContents`.
-Calling `event.preventDefault()` will prevent the object from being returned.
-Custom value can be returned by setting `event.returnValue`.
-
 ## Methods

 The `app` object has the following methods:
@@ -576,6 +546,7 @@ app.exit(0)
 ### `app.isReady()`

 Returns `Boolean` - `true` if Electron has finished initializing, `false` otherwise.
+See also `app.whenReady()`.

 ### `app.whenReady()`

@@ -966,7 +937,7 @@ if (!gotTheLock) {
  })

  // Create myWindow, load the rest of the app, etc...
-  app.on('ready', () => {
+  app.whenReady().then(() => {
  })
 }
 ```
@@ -1023,6 +994,17 @@ Updates the current activity if its type matches `type`, merging the entries fro

 Changes the [Application User Model ID][app-user-model-id] to `id`.

+### `app.setActivationPolicy(policy)` _macOS_
+
+* `policy` String - Can be 'regular', 'accessory', or 'prohibited'.
+
+Sets the activation policy for a given app.
+
+Activation policy types:
+* 'regular' - The application is an ordinary app that appears in the Dock and may have a user interface.
+* 'accessory' - The application doesn’t appear in the Dock and doesn’t have a menu bar, but it may be activated programmatically or by clicking on one of its windows.
+* 'prohibited' - The application doesn’t appear in the Dock and may not create windows or be activated.
+
 ### `app.importCertificate(options, callback)` _Linux_

 * `options` Object
@@ -1045,7 +1027,7 @@ This method can only be called before app is ready.

 By default, Chromium disables 3D APIs (e.g. WebGL) until restart on a per
 domain basis if the GPU processes crashes too frequently. This function
-disables that behaviour.
+disables that behavior.

 This method can only be called before app is ready.

@@ -1214,7 +1196,7 @@ Show the app's about panel options. These options can be overridden with `app.se
  * `website` String (optional) _Linux_ - The app's website.
  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.

-Set the about panel options. This will override the values defined in the app's `.plist` file on MacOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
+Set the about panel options. This will override the values defined in the app's `.plist` file on macOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.

 If you do not set `credits` but still wish to surface them in your app, AppKit will look for a file named "Credits.html", "Credits.rtf", and "Credits.rtfd", in that order, in the bundle returned by the NSBundle class method main. The first file found is used, and if none is found, the info area is left blank. See Apple [documentation](https://developer.apple.com/documentation/appkit/nsaboutpaneloptioncredits?language=objc) for more information.

@@ -1243,9 +1225,9 @@ stopAccessingSecurityScopedResource()

 Start accessing a security scoped resource. With this method Electron applications that are packaged for the Mac App Store may reach outside their sandbox to access files chosen by the user. See [Apple's documentation](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) for a description of how this system works.

-### `app.enableSandbox()` _Experimental_
+### `app.enableSandbox()`

-Enables full sandbox mode on the app.
+Enables full sandbox mode on the app. This means that all renderers will be launched sandboxed, regardless of the value of the `sandbox` flag in WebPreferences.

 This method can only be called before app is ready.

@@ -1327,7 +1309,7 @@ command line arguments that Chromium uses.

 ### `app.dock` _macOS_ _Readonly_

-A [`Dock`](./dock.md) object that allows you to perform actions on your app icon in the user's
+A [`Dock`](./dock.md) `| undefined` object that allows you to perform actions on your app icon in the user's
 dock on macOS.

 ### `app.isPackaged` _Readonly_
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -15,12 +15,9 @@ relative to its owning window. It is meant to be an alternative to the
 // In the main process.
 const { BrowserView, BrowserWindow } = require('electron')

-let win = new BrowserWindow({ width: 800, height: 600 })
-win.on('closed', () => {
-  win = null
-})
+const win = new BrowserWindow({ width: 800, height: 600 })

-let view = new BrowserView()
+const view = new BrowserView()
 win.setBrowserView(view)
 view.setBounds({ x: 0, y: 0, width: 300, height: 300 })
 view.webContents.loadURL('https://electronjs.org')
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -11,10 +11,7 @@ const { BrowserWindow } = require('electron')
 // Or use `remote` from the renderer process.
 // const { BrowserWindow } = require('electron').remote

-let win = new BrowserWindow({ width: 800, height: 600 })
-win.on('closed', () => {
-  win = null
-})
+const win = new BrowserWindow({ width: 800, height: 600 })

 // Load a remote URL
 win.loadURL('https://github.com')
@@ -180,7 +177,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `simpleFullscreen` Boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
  * `skipTaskbar` Boolean (optional) - Whether to show the window in taskbar. Default is
    `false`.
-  * `kiosk` Boolean (optional) - The kiosk mode. Default is `false`.
+  * `kiosk` Boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
  * `title` String (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
  * `icon` ([NativeImage](native-image.md) | String) (optional) - The window icon. On Windows it is
    recommended to use `ICO` icons to get best visual effects, you can also
@@ -210,7 +207,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `opacity` Number (optional) - Set the initial opacity of the window, between 0.0 (fully
    transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
  * `darkTheme` Boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK+3 desktop environments. Default is `false`.
+    some GTK desktop environments. Default is [`nativeTheme.shouldUseDarkColors`](native-theme.md).
  * `transparent` Boolean (optional) - Makes the window [transparent](frameless-window.md#transparent-window).
    Default is `false`. On Windows, does not work unless the window is frameless.
  * `type` String (optional) - The type of window, default is normal window. See more about
@@ -292,7 +289,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      between the web pages even when you specified different values for them,
      including but not limited to `preload`, `sandbox` and `nodeIntegration`.
      So it is suggested to use exact same `webPreferences` for web pages with
-      the same `affinity`. _This property is experimental_
+      the same `affinity`. _Deprecated_
    * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
      `300%`. Default is `1.0`.
    * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.
@@ -387,16 +384,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      to accessibility tools such as screen readers. This string is not directly
      visible to users.
    * `spellcheck` Boolean (optional) - Whether to enable the builtin spellchecker.
-      Default is `false`.
-    * `enableWebSQL` Boolean (optional) - Whether to enable the [WebSQL api](https://www.w3.org/TR/webdatabase/).
      Default is `true`.
-    * `v8CacheOptions` String (optional) - Enforces the v8 code caching policy
-      used by blink. Accepted values are
-      * `none` - Disables code caching
-      * `code` - Heuristic based code caching
-      * `bypassHeatCheck` - Bypass code caching heuristics but with lazy compilation
-      * `bypassHeatCheckAndEagerCompile` - Same as above except compilation is eager.
-      Default policy is `code`.

 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -635,12 +623,6 @@ Returns:

 Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`, `left`.

-The method underlying this event is built to handle older macOS-style trackpad swiping,
-where the content on the screen doesn't move with the swipe. Most macOS trackpads are not
-configured to allow this kind of swiping anymore, so in order for it to emit properly the
-'Swipe between pages' preference in `System Preferences > Trackpad > More Gestures` must be
-set to 'Swipe with two or three fingers'.
-
 #### Event: 'rotate-gesture' _macOS_

 Returns:
@@ -697,7 +679,7 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I

 Returns `BrowserWindow` - The window with the given `id`.

-#### `BrowserWindow.addExtension(path)`
+#### `BrowserWindow.addExtension(path)` _Deprecated_

 * `path` String

@@ -708,7 +690,10 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

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

 * `name` String

@@ -717,7 +702,10 @@ Remove a Chrome extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-#### `BrowserWindow.getExtensions()`
+**Note:** This method is deprecated. Instead, use
+[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
+
+#### `BrowserWindow.getExtensions()` _Deprecated_

 Returns `Record<String, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -725,7 +713,10 @@ an Object containing `name` and `version` properties.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-#### `BrowserWindow.addDevToolsExtension(path)`
+**Note:** This method is deprecated. Instead, use
+[`ses.getAllExtensions()`](session.md#sesgetallextensions).
+
+#### `BrowserWindow.addDevToolsExtension(path)` _Deprecated_

 * `path` String

@@ -741,7 +732,10 @@ The method will also not return if the extension's manifest is missing or incomp
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

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

 * `name` String

@@ -750,7 +744,10 @@ Remove a DevTools extension by name.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

-#### `BrowserWindow.getDevToolsExtensions()`
+**Note:** This method is deprecated. Instead, use
+[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
+
+#### `BrowserWindow.getDevToolsExtensions()` _Deprecated_

 Returns `Record<string, ExtensionInfo>` - The keys are the extension names and each value is
 an Object containing `name` and `version` properties.
@@ -767,6 +764,9 @@ console.log(installed)
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

+**Note:** This method is deprecated. Instead, use
+[`ses.getAllExtensions()`](session.md#sesgetallextensions).
+
 ### Instance Properties

 Objects created with `new BrowserWindow` have the following properties:
@@ -788,7 +788,7 @@ events.

 #### `win.id` _Readonly_

-A `Integer` property representing the unique ID of the window.
+A `Integer` property representing the unique ID of the window. Each ID is unique among all `BrowserWindow` instances of the entire Electron application.

 #### `win.autoHideMenuBar`

@@ -797,6 +797,47 @@ A `Boolean` property that determines whether the window menu bar should hide its
 If the menu bar is already visible, setting this property to `true` won't
 hide it immediately.

+#### `win.simpleFullScreen`
+
+A `Boolean` property that determines whether the window is in simple (pre-Lion) fullscreen mode.
+
+#### `win.visibleOnAllWorkspaces`
+
+A `Boolean` property that determines whether the window is visible on all workspaces.
+
+**Note:** Always returns false on Windows.
+
+#### `win.shadow`
+
+A `Boolean` property that determines whether the window has a shadow.
+
+#### `win.menuBarVisible` _Windows_ _Linux_
+
+A `Boolean` property that determines whether the menu bar should be visible.
+
+**Note:** If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
+
+####  `win.kiosk`
+
+A `Boolean` property that determines whether the window is in kiosk mode.
+
+#### `win.documentEdited` _macOS_
+
+A `Boolean` property that specifies whether the window’s document has been edited.
+
+The icon in title bar will become gray when set to `true`.
+
+#### `win.representedFilename` _macOS_
+
+A `String` property that determines the pathname of the file the window represents,
+and the icon of the file will show in window's title bar.
+
+#### `win.title`
+
+A `String` property that determines the title of the native window.
+
+**Note:** The title of the web page can be different from the title of the native window.
+
 #### `win.minimizable`

 A `Boolean` property that determines whether the window can be manually minimized by user.
@@ -952,7 +993,7 @@ Returns `Boolean` - Whether the window is in fullscreen mode.

 Enters or leaves simple fullscreen mode.

-Simple fullscreen mode emulates the native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
+Simple fullscreen mode emulates the native fullscreen behavior found in versions of macOS prior to Lion (10.7).

 #### `win.isSimpleFullScreen()` _macOS_

@@ -962,11 +1003,11 @@ 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_
+#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_ _Linux_

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
-* `extraSize` [Size](structures/size.md) (optional) - The extra size not to be included while
+ * `extraSize` [Size](structures/size.md) (optional) _macOS_ - The extra size not to be included while
 maintaining the aspect ratio.

 This will make a window maintain an aspect ratio. The extra size allows a
@@ -979,13 +1020,10 @@ Perhaps there are 15 pixels of controls on the left edge, 25 pixels of controls
 on the right edge and 50 pixels of controls below the player. In order to
 maintain a 16:9 aspect ratio (standard aspect ratio for HD @1920x1080) within
 the player itself we would call this function with arguments of 16/9 and
-[ 40, 50 ]. The second argument doesn't care where the extra width and height
+{ width: 40, height: 50 }. The second argument doesn't care where the extra width and height
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.

-Calling this function with a value of `0` will remove any previously set aspect
-ratios.
-
 #### `win.setBackgroundColor(backgroundColor)`

 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1035,6 +1073,11 @@ console.log(win.getBounds())

 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.

+#### `win.getBackgroundColor()`
+
+Returns `String` - Gets the background color of the window. See [Setting
+`backgroundColor`](#setting-backgroundcolor).
+
 #### `win.setContentBounds(bounds[, animate])`

 * `bounds` [Rectangle](structures/rectangle.md)
@@ -1061,7 +1104,7 @@ Disable or enable the window.

 #### `win.isEnabled()`

-Returns `Boolean` - whether the window is enabled.
+Returns Boolean - whether the window is enabled.

 #### `win.setSize(width, height[, animate])`

@@ -1274,7 +1317,7 @@ Makes the window not show in the taskbar.

 * `flag` Boolean

-Enters or leaves the kiosk mode.
+Enters or leaves kiosk mode.

 #### `win.isKiosk()`

@@ -1604,12 +1647,9 @@ Sets whether the menu bar should be visible. If the menu bar is auto-hide, users

 Returns `Boolean` - Whether the menu bar is visible.

-#### `win.setVisibleOnAllWorkspaces(visible[, options])`
+#### `win.setVisibleOnAllWorkspaces(visible)`

 * `visible` Boolean
-* `options` Object (optional)
-  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows _deprecated_

 Sets whether the window should be visible on all workspaces.

@@ -1728,7 +1768,7 @@ Set a custom position for the traffic light buttons. Can only be used with `titl
 Returns `Point` - The current position for the traffic light buttons. Can only be used with `titleBarStyle`
 set to `hidden`.

-#### `win.setTouchBar(touchBar)` _macOS_ _Experimental_
+#### `win.setTouchBar(touchBar)` _macOS_

 * `touchBar` TouchBar | null

--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -11,89 +11,71 @@ const { app } = require('electron')
 app.commandLine.appendSwitch('remote-debugging-port', '8315')
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1')

-app.on('ready', () => {
+app.whenReady().then(() => {
  // Your code here
 })
 ```

-## --ignore-connections-limit=`domains`
+## Electron CLI Flags

-Ignore the connections limit for `domains` list separated by `,`.
+### --auth-server-whitelist=`url`

-## --disable-http-cache
-
-Disables the disk cache for HTTP requests.
-
-## --disable-http2
-
-Disable HTTP/2 and SPDY/3.1 protocols.
-
-### --disable-ntlm-v2
-
-Disables NTLM v2 for posix platforms, no effect elsewhere.
-
-## --lang
-
-Set a custom locale.
-
-## --inspect=`port` and --inspect-brk=`port`
-
-Debug-related flags, see the [Debugging the Main Process][debugging-main-process] guide for details.
-
-## --remote-debugging-port=`port`
-
-Enables remote debugging over HTTP on the specified `port`.
-
-## --disk-cache-size=`size`
-
-Forces the maximum disk space to be used by the disk cache, in bytes.
-
-## --js-flags=`flags`
-
-Specifies the flags passed to the Node.js engine. It has to be passed when starting
-Electron if you want to enable the `flags` in the main process.
-
-```sh
-$ electron --js-flags="--harmony_proxies --harmony_collections" your-app
-```
-
-See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
-
-## --proxy-server=`address:port`
-
-Use a specified proxy server, which overrides the system setting. This switch
-only affects requests with HTTP protocol, including HTTPS and WebSocket
-requests. It is also noteworthy that not all proxy servers support HTTPS and
-WebSocket requests. The proxy URL does not support username and password
-authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
-
-## --proxy-bypass-list=`hosts`
-
-Instructs Electron to bypass the proxy server for the given semi-colon-separated
-list of hosts. This flag has an effect only if used in tandem with
-`--proxy-server`.
+A comma-separated list of servers for which integrated authentication is enabled.

 For example:

-```javascript
-const { app } = require('electron')
-app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
+```sh
+--auth-server-whitelist='*example.com, *foobar.com, *baz'
 ```

-Will use the proxy server for all hosts except for local addresses (`localhost`,
-`127.0.0.1` etc.), `google.com` subdomains, hosts that contain the suffix
-`foo.com` and anything at `1.2.3.4:5678`.
+then any `url` ending with `example.com`, `foobar.com`, `baz` will be considered
+for integrated authentication. Without `*` prefix the URL has to match exactly.

-## --proxy-pac-url=`url`
+### --auth-negotiate-delegate-whitelist=`url`

-Uses the PAC script at the specified `url`.
+A comma-separated list of servers for which delegation of user credentials is required.
+Without `*` prefix the URL has to match exactly.

-## --no-proxy-server
+### --disable-http-cache

-Don't use a proxy server and always make direct connections. Overrides any other
-proxy server flags that are passed.
+Disables the disk cache for HTTP requests.

-## --host-rules=`rules`
+### --disable-http2
+
+Disable HTTP/2 and SPDY/3.1 protocols.
+
+### --disable-renderer-backgrounding
+
+Prevents Chromium from lowering the priority of invisible pages' renderer
+processes.
+
+This flag is global to all renderer processes, if you only want to disable
+throttling in one window, you can take the hack of
+[playing silent audio][play-silent-audio].
+
+### --disk-cache-size=`size`
+
+Forces the maximum disk space to be used by the disk cache, in bytes.
+
+### --enable-api-filtering-logging
+
+Enables caller stack logging for the following APIs (filtering events):
+- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+- `remote.require()` / `remote-require`
+- `remote.getGlobal()` / `remote-get-builtin`
+- `remote.getBuiltin()` / `remote-get-global`
+- `remote.getCurrentWindow()` / `remote-get-current-window`
+- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
+
+### --enable-logging
+
+Prints Chromium's logging into console.
+
+This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
+earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
+environment variable to achieve the same effect.
+
+### --host-rules=`rules`

 A comma-separated list of `rules` that control how hostnames are mapped.

@@ -111,69 +93,96 @@ These mappings apply to the endpoint host in a net request (the TCP connect
 and host resolver in a direct connection, and the `CONNECT` in an HTTP proxy
 connection, and the endpoint host in a `SOCKS` proxy connection).

-## --host-resolver-rules=`rules`
+### --host-resolver-rules=`rules`

 Like `--host-rules` but these `rules` only apply to the host resolver.

-## --auth-server-whitelist=`url`
-
-A comma-separated list of servers for which integrated authentication is enabled.
-
-For example:
-
-```sh
--auth-server-whitelist='*example.com, *foobar.com, *baz'
-```
-
-then any `url` ending with `example.com`, `foobar.com`, `baz` will be considered
-for integrated authentication. Without `*` prefix the URL has to match exactly.
-
-## --auth-negotiate-delegate-whitelist=`url`
-
-A comma-separated list of servers for which delegation of user credentials is required.
-Without `*` prefix the URL has to match exactly.
-
-## --ignore-certificate-errors
+### --ignore-certificate-errors

 Ignores certificate related errors.

-## --ppapi-flash-path=`path`
+### --ignore-connections-limit=`domains`

-Sets the `path` of the pepper flash plugin.
+Ignore the connections limit for `domains` list separated by `,`.

-## --ppapi-flash-version=`version`
+### --js-flags=`flags`

-Sets the `version` of the pepper flash plugin.
+Specifies the flags passed to the Node.js engine. It has to be passed when starting
+Electron if you want to enable the `flags` in the main process.

-## --log-net-log=`path`
+```sh
+$ electron --js-flags="--harmony_proxies --harmony_collections" your-app
+```
+
+See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
+
+### --lang
+
+Set a custom locale.
+
+### --log-net-log=`path`

 Enables net log events to be saved and writes them to `path`.

-## --disable-renderer-backgrounding
+### --no-proxy-server

-Prevents Chromium from lowering the priority of invisible pages' renderer
-processes.
+Don't use a proxy server and always make direct connections. Overrides any other
+proxy server flags that are passed.

-This flag is global to all renderer processes, if you only want to disable
-throttling in one window, you can take the hack of
-[playing silent audio][play-silent-audio].
+### --no-sandbox

-## --enable-logging
+Disables Chromium sandbox, which is now enabled by default.
+Should only be used for testing.

-Prints Chromium's logging into console.
+### --proxy-bypass-list=`hosts`

-This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
-earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
-environment variable to achieve the same effect.
+Instructs Electron to bypass the proxy server for the given semi-colon-separated
+list of hosts. This flag has an effect only if used in tandem with
+`--proxy-server`.

-## --v=`log_level`
+For example:
+
+```javascript
+const { app } = require('electron')
+app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
+```
+
+Will use the proxy server for all hosts except for local addresses (`localhost`,
+`127.0.0.1` etc.), `google.com` subdomains, hosts that contain the suffix
+`foo.com` and anything at `1.2.3.4:5678`.
+
+### --proxy-pac-url=`url`
+
+Uses the PAC script at the specified `url`.
+
+### --proxy-server=`address:port`
+
+Use a specified proxy server, which overrides the system setting. This switch
+only affects requests with HTTP protocol, including HTTPS and WebSocket
+requests. It is also noteworthy that not all proxy servers support HTTPS and
+WebSocket requests. The proxy URL does not support username and password
+authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/detail?id=615947).
+
+### --remote-debugging-port=`port`
+
+Enables remote debugging over HTTP on the specified `port`.
+
+### --ppapi-flash-path=`path`
+
+Sets the `path` of the pepper flash plugin.
+
+### --ppapi-flash-version=`version`
+
+Sets the `version` of the pepper flash plugin.
+
+### --v=`log_level`

 Gives the default maximal active V-logging level; 0 is the default. Normally
 positive values are used for V-logging levels.

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

-## --vmodule=`pattern`
+### --vmodule=`pattern`

 Gives the per-module maximal V-logging levels to override the value given by
 `--v`. E.g. `my_module=2,foo*=3` would change the logging level for all code in
@@ -185,21 +194,38 @@ logging level for all code in the source files under a `foo/bar` directory.

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

-## --enable-api-filtering-logging
+## Node.js Flags

-Enables caller stack logging for the following APIs (filtering events):
- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
- `remote.require()` / `remote-require`
- `remote.getGlobal()` / `remote-get-builtin`
- `remote.getBuiltin()` / `remote-get-global`
- `remote.getCurrentWindow()` / `remote-get-current-window`
- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
- `remote.getGuestWebContents()` / `remote-get-guest-web-contents`
+Electron supports some of the [CLI flags][node-cli] supported by Node.js.

-## --no-sandbox
+**Note:** Passing unsupported command line switches to Electron when it is not running in `ELECTRON_RUN_AS_NODE` will have no effect.

-Disables Chromium sandbox, which is now enabled by default.
-Should only be used for testing.
+### --inspect-brk[=[host:]port]
+
+Activate inspector on host:port and break at start of user script. Default host:port is 127.0.0.1:9229.
+
+Aliased to `--debug-brk=[host:]port`.
+
+### --inspect-port=[host:]port
+
+Set the `host:port` to be used when the inspector is activated. Useful when activating the inspector by sending the SIGUSR1 signal. Default host is `127.0.0.1`.
+
+Aliased to `--debug-port=[host:]port`.
+
+### --inspect[=[host:]port]
+
+Activate inspector on `host:port`. Default is `127.0.0.1:9229`.
+
+V8 inspector integration allows tools such as Chrome DevTools and IDEs to debug and profile Electron instances. The tools attach to Electron instances via a TCP port and communicate using the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/).
+
+See the [Debugging the Main Process][debugging-main-process] guide for more details.
+
+Aliased to `--debug[=[host:]port`.
+
+### --inspect-publish-uid=stderr,http
+Specify ways of the inspector web socket url exposure.
+
+By default inspector websocket url is available in stderr and under /json/list endpoint on http://host:port/json/list.

 [app]: app.md
 [append-switch]: app.md#appcommandlineappendswitchswitch-value
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -13,7 +13,7 @@ module is emitted.
 ```javascript
 const { app, contentTracing } = require('electron')

-app.on('ready', () => {
+app.whenReady().then(() => {
  (async () => {
    await contentTracing.startRecording({
      include_categories: ['*']
--- a/docs/api/cookies.md
+++ b/docs/api/cookies.md
@@ -96,6 +96,7 @@ the response.
  * `expirationDate` Double (optional) - The expiration date of the cookie as the number of
    seconds since the UNIX epoch. If omitted then the cookie becomes a session
    cookie and will not be retained between sessions.
+  * `sameSite` String (optional) - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy to apply to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.  Default is `no_restriction`.

 Returns `Promise<void>` - A promise which resolves when the cookie has been set

--- a/docs/api/debugger.md
+++ b/docs/api/debugger.md
@@ -52,8 +52,6 @@ Returns:
 * `method` String - Method name.
 * `params` any - Event parameters defined by the 'parameters'
   attribute in the remote debugging protocol.
-* `sessionId` String - Unique identifier of attached debugging session,
-   will match the value sent from `debugger.sendCommand`.

 Emitted whenever the debugging target issues an instrumentation event.

@@ -76,16 +74,11 @@ Returns `Boolean` - Whether a debugger is attached to the `webContents`.

 Detaches the debugger from the `webContents`.

-#### `debugger.sendCommand(method[, commandParams, sessionId])`
+#### `debugger.sendCommand(method[, commandParams])`

 * `method` String - Method name, should be one of the methods defined by the
   [remote debugging protocol][rdp].
 * `commandParams` any (optional) - JSON object with request parameters.
-* `sessionId` String (optional) - send command to the target with associated
-   debugging session id. The initial value can be obtained by sending
-   [Target.attachToTarget][attachToTarget] message.
-
-[attachToTarget]: https://chromedevtools.github.io/devtools-protocol/tot/Target/#method-attachToTarget

 Returns `Promise<any>` - A promise that resolves with the response defined by
 the 'returns' attribute of the command description in the remote debugging protocol
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -269,7 +269,6 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.

 ### `dialog.showMessageBox([browserWindow, ]options)`

--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -53,16 +53,23 @@ Unsupported options are:

 ### `GOOGLE_API_KEY`

-You can provide an API key for making requests to Google's geocoding webservice. To do this, place the following code in your main process
-file, before opening any browser windows that will make geocoding requests:
+Geolocation support in Electron requires the use of Google Cloud Platform's
+geolocation webservice. To enable this feature, acquire a
+[Google API key](https://developers.google.com/maps/documentation/geolocation/get-api-key)
+and place the following code in your main process file, before opening any
+browser windows that will make geolocation requests:

 ```javascript
 process.env.GOOGLE_API_KEY = 'YOUR_KEY_HERE'
 ```

-For instructions on how to acquire a Google API key, visit [this page](https://developers.google.com/maps/documentation/javascript/get-api-key).
-By default, a newly generated Google API key may not be allowed to make
-geocoding requests. To enable geocoding requests, visit [this page](https://developers.google.com/maps/documentation/geocoding/get-api-key).
+By default, a newly generated Google API key may not be allowed to make geolocation requests.
+To enable the geolocation webservice for your project, enable it through the
+[API library](https://console.cloud.google.com/apis/library).
+
+N.B. You will need to add a
+[Billing Account](https://cloud.google.com/billing/docs/how-to/payment-methods#add_a_payment_method)
+to the project associated to the API key for the geolocation webservice to work.

 ### `ELECTRON_NO_ASAR`

@@ -73,6 +80,18 @@ and spawned child processes that set `ELECTRON_RUN_AS_NODE`.

 Starts the process as a normal Node.js process.

+In this mode, you will be able to pass [cli options](https://nodejs.org/api/cli.html) to Node.js as
+you would when running the normal Node.js executable, with the exception of the following flags:
+
+* "--openssl-config"
+* "--use-bundled-ca"
+* "--use-openssl-ca",
+* "--force-fips"
+* "--enable-fips"
+
+These flags are disabled owing to the fact that Electron uses BoringSSL instead of OpenSSL when building Node.js'
+`crypto` module, and so will not work as designed.
+
 ### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_

 Don't attach to the current console session.
@@ -126,16 +145,5 @@ the `electron` command to use the specified build of Electron instead of
 the one downloaded by `npm install`. Usage:

 ```sh
-export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Debug
+export ELECTRON_OVERRIDE_DIST_PATH=/Users/username/projects/electron/out/Testing
 ```
-
-## Set By Electron
-
-Electron sets some variables in your environment at runtime.
-
-### `ORIGINAL_XDG_CURRENT_DESKTOP`
-
-This variable is set to the value of `XDG_CURRENT_DESKTOP` that your application
-originally launched with.  Electron sometimes modifies the value of `XDG_CURRENT_DESKTOP`
-to affect other logic within Chromium so if you want access to the _original_ value
-you should look up this environment variable instead.
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -0,0 +1,104 @@
+# Chrome Extension Support
+
+Electron supports a subset of the [Chrome Extensions
+API][chrome-extensions-api-index], primarily to support DevTools extensions and
+Chromium-internal extensions, but it also happens to support some other
+extension capabilities.
+
+[chrome-extensions-api-index]: https://developer.chrome.com/extensions/api_index
+
+> **Note:** Electron does not support arbitrary Chrome extensions from the
+> store, and it is a **non-goal** of the Electron project to be perfectly
+> compatible with Chrome's implementation of Extensions.
+
+## Loading extensions
+
+Electron only supports loading unpacked extensions (i.e., `.crx` files do not
+work). Extensions are installed per-`session`. To load an extension, call
+[`ses.loadExtension`](session.md#sesloadextensionpath):
+
+```js
+const { session } = require('electron')
+
+session.loadExtension('path/to/unpacked/extension').then(({ id }) => {
+  // ...
+})
+```
+
+Loaded extensions will not be automatically remembered across exits; if you do
+not call `loadExtension` when the app runs, the extension will not be loaded.
+
+Note that loading extensions is only supported in persistent sessions.
+Attempting to load an extension into an in-memory session will throw an error.
+
+See the [`session`](session.md) documentation for more information about
+loading, unloading, and querying active extensions.
+
+## Supported Extensions APIs
+
+We support the following extensions APIs, with some caveats. Other APIs may
+additionally be supported, but support for any APIs not listed here is
+provisional and may be removed.
+
+### `chrome.devtools.inspectedWindow`
+
+All features of this API are supported.
+
+### `chrome.devtools.network`
+
+All features of this API are supported.
+
+### `chrome.devtools.panels`
+
+All features of this API are supported.
+
+### `chrome.extension`
+
+The following properties of `chrome.extension` are supported:
+
+- `chrome.extension.lastError`
+
+The following methods of `chrome.extension` are supported:
+
+- `chrome.extension.getURL`
+- `chrome.extension.getBackgroundPage`
+
+### `chrome.runtime`
+
+The following properties of `chrome.runtime` are supported:
+
+- `chrome.runtime.lastError`
+- `chrome.runtime.id`
+
+The following methods of `chrome.runtime` are supported:
+
+- `chrome.runtime.getBackgroundPage`
+- `chrome.runtime.getManifest`
+- `chrome.runtime.getURL`
+- `chrome.runtime.connect`
+- `chrome.runtime.sendMessage`
+
+The following events of `chrome.runtime` are supported:
+
+- `chrome.runtime.onStartup`
+- `chrome.runtime.onInstalled`
+- `chrome.runtime.onSuspend`
+- `chrome.runtime.onSuspendCanceled`
+- `chrome.runtime.onConnect`
+- `chrome.runtime.onMessage`
+
+### `chrome.storage`
+
+Only `chrome.storage.local` is supported; `chrome.storage.sync` and
+`chrome.storage.managed` are not.
+
+### `chrome.tabs`
+
+The following methods of `chrome.tabs` are supported:
+
+- `chrome.tabs.sendMessage`
+- `chrome.tabs.executeScript`
+
+> **Note:** In Chrome, passing `-1` as a tab ID signifies the "currently active
+> tab". Since Electron has no such concept, passing `-1` as a tab ID is not
+> supported and will raise an error.
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -52,7 +52,7 @@ win.show()
 Uses custom drawn close, and miniaturize buttons that display
 when hovering in the top left of the window. The fullscreen button
 is not available due to restrictions of frameless windows as they
-interface with Apple's MacOS window masks. These custom buttons prevent
+interface with Apple's macOS window masks. These custom buttons prevent
 issues with mouse events that occur with the standard window toolbar buttons.
 This option is only applicable for frameless windows.

@@ -158,7 +158,7 @@ buttons in titlebar non-draggable.

 ## Text selection

-In a frameless window the dragging behaviour may conflict with selecting text.
+In a frameless window the dragging behavior may conflict with selecting text.
 For example, when you drag the titlebar you may accidentally select the text on
 the titlebar. To prevent this, you need to disable text selection within a
 draggable area like this:
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -15,7 +15,7 @@ event of the app module is emitted.
 ```javascript
 const { app, globalShortcut } = require('electron')

-app.on('ready', () => {
+app.whenReady().then(() => {
  // Register a 'CommandOrControl+X' shortcut listener.
  const ret = globalShortcut.register('CommandOrControl+X', () => {
    console.log('CommandOrControl+X is pressed')
--- a/docs/api/in-app-purchase.md
+++ b/docs/api/in-app-purchase.md
@@ -40,11 +40,17 @@ Retrieves the product descriptions.

 ### `inAppPurchase.canMakePayments()`

-Returns `Boolean`, whether a user can make a payment.
+Returns `Boolean` - whether a user can make a payment.
+
+### `inAppPurchase.restoreCompletedTransactions()`
+
+Restores finished transactions. This method can be called either to install purchases on additional devices, or to restore purchases for an application that the user deleted and reinstalled.
+
+[The payment queue](https://developer.apple.com/documentation/storekit/skpaymentqueue?language=objc) delivers a new transaction for each previously completed transaction that can be restored. Each transaction includes a copy of the original transaction.

 ### `inAppPurchase.getReceiptURL()`

-Returns `String`, the path to the receipt.
+Returns `String` - the path to the receipt.

 ### `inAppPurchase.finishAllTransactions()`

--- a/docs/api/incoming-message.md
+++ b/docs/api/incoming-message.md
@@ -51,12 +51,17 @@ A `String` representing the HTTP status message.

 #### `response.headers`

-An `Record<string, string[]>` representing the response HTTP headers. The `headers` object is
+A `Record<string, string | string[]>` representing the HTTP response headers. The `headers` object is
 formatted as follows:

 * All header names are lowercased.
-* Each header name produces an array-valued property on the headers object.
-* Each header value is pushed into the array associated with its header name.
+* Duplicates of `age`, `authorization`, `content-length`, `content-type`,
+`etag`, `expires`, `from`, `host`, `if-modified-since`, `if-unmodified-since`,
+`last-modified`, `location`, `max-forwards`, `proxy-authorization`, `referer`,
+`retry-after`, `server`, or `user-agent` are discarded.
+* `set-cookie` is always an array. Duplicates are added to the array.
+* For duplicate `cookie` headers, the values are joined together with '; '.
+* For all other headers, the values are joined together with ', '.

 #### `response.httpVersion`

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -57,7 +57,7 @@ Removes all listeners, or those of the specified `channel`.

 Send an asynchronous message to the main process via `channel`, along with
 arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -68,6 +68,10 @@ throw an exception.
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.

+If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
+
+If you want to receive a single response from the main process, like the result of a method call, consider using [`ipcRenderer.invoke`](#ipcrendererinvokechannel-args).
+
 ### `ipcRenderer.invoke(channel, ...args)`

 * `channel` String
@@ -77,7 +81,7 @@ Returns `Promise<any>` - Resolves with the response from the main process.

 Send a message to the main process via `channel` and expect a result
 asynchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -102,6 +106,10 @@ ipcMain.handle('some-name', async (event, someArgument) => {
 })
 ```

+If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
+
+If you do not need a respons to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
+
 ### `ipcRenderer.sendSync(channel, ...args)`

 * `channel` String
@@ -111,7 +119,7 @@ Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.

 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

@@ -127,6 +135,35 @@ and replies by setting `event.returnValue`.
 > last resort. It's much better to use the asynchronous version,
 > [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).

+### `ipcRenderer.postMessage(channel, message, [transfer])`
+
+* `channel` String
+* `message` any
+* `transfer` MessagePort[] (optional)
+
+Send a message to the main process, optionally transferring ownership of zero
+or more [`MessagePort`][] objects.
+
+The transferred `MessagePort` objects will be available in the main process as
+[`MessagePortMain`](message-port-main.md) objects by accessing the `ports`
+property of the emitted event.
+
+For example:
+```js
+// Renderer process
+const { port1, port2 } = new MessageChannel()
+ipcRenderer.postMessage('port', { message: 'hello' }, [port1])
+
+// Main process
+ipcMain.on('port', (e, msg) => {
+  const [port] = e.ports
+  // ...
+})
+```
+
+For more information on using `MessagePort` and `MessageChannel`, see the [MDN
+documentation](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel).
+
 ### `ipcRenderer.sendTo(webContentsId, channel, ...args)`

 * `webContentsId` Number
@@ -150,4 +187,5 @@ in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.

 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
+[`window.postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
+[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -12,9 +12,9 @@ See [`Menu`](menu.md) for examples.
  * `click` Function (optional) - Will be called with
    `click(menuItem, browserWindow, event)` when the menu item is clicked.
    * `menuItem` MenuItem
-    * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
+    * `browserWindow` [BrowserWindow](browser-window.md)
    * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `close`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `minimize`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
  * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
    `radio`.
@@ -69,7 +69,6 @@ a `type`.
 The `role` property can have following values:

 * `undo`
-* `about` - Trigger a native about panel (custom message box on Window, which does not provide its own).
 * `redo`
 * `cut`
 * `copy`
@@ -95,6 +94,7 @@ The `role` property can have following values:
 The following additional roles are available on _macOS_:

 * `appMenu` - Whole default "App" menu (About, Services, etc.)
+* `about` - Map to the `orderFrontStandardAboutPanel` action.
 * `hide` - Map to the `hide` action.
 * `hideOthers` - Map to the `hideOtherApplications` action.
 * `unhide` - Map to the `unhideAllApplications` action.
@@ -117,7 +117,7 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.

-**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on MacOS.
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.

 ### Instance Properties

@@ -130,8 +130,7 @@ dynamically changed.

 #### `menuItem.label`

-A `String` indicating the item's visible label, this property can be
-dynamically changed.
+A `String` indicating the item's visible label.

 #### `menuItem.click`

@@ -165,7 +164,7 @@ item's icon, if set.

 #### `menuItem.sublabel`

-A `String` indicating the item's sublabel, this property can be dynamically changed.
+A `String` indicating the item's sublabel.

 #### `menuItem.toolTip` _macOS_

@@ -197,7 +196,9 @@ You can add a `click` function for additional behavior.
 #### `menuItem.registerAccelerator`

 A `Boolean` indicating if the accelerator should be registered with the
-system or just displayed, this property can be dynamically changed.
+system or just displayed.
+
+This property can be dynamically changed.

 #### `menuItem.commandId`

--- a/docs/api/message-channel-main.md
+++ b/docs/api/message-channel-main.md
@@ -0,0 +1,32 @@
+# MessageChannelMain
+
+`MessageChannelMain` is the main-process-side equivalent of the DOM
+[`MessageChannel`][] object. Its singular function is to create a pair of
+connected [`MessagePortMain`](message-port-main.md) objects.
+
+See the [Channel Messaging API][] documentation for more information on using
+channel messaging.
+
+## Class: MessageChannelMain
+
+Process: [Main](../glossary.md#main-process)
+
+Example:
+```js
+const { port1, port2 } = new MessageChannelMain()
+w.webContents.postMessage('port', null, [port2])
+port1.postMessage({ some: 'message' })
+```
+
+### Instance Properties
+
+#### `channel.port1`
+
+A [`MessagePortMain`](message-port-main.md) property.
+
+#### `channel.port2`
+
+A [`MessagePortMain`](message-port-main.md) property.
+
+[`MessageChannel`]: https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel
+[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API
--- a/docs/api/message-port-main.md
+++ b/docs/api/message-port-main.md
@@ -0,0 +1,55 @@
+# MessagePortMain
+
+`MessagePortMain` is the main-process-side equivalent of the DOM
+[`MessagePort`][] object. It behaves similarly to the DOM version, with the
+exception that it uses the Node.js `EventEmitter` event system, instead of the
+DOM `EventTarget` system. This means you should use `port.on('message', ...)`
+to listen for events, instead of `port.onmessage = ...` or
+`port.addEventListener('message', ...)`
+
+See the [Channel Messaging API][] documentation for more information on using
+channel messaging.
+
+`MessagePortMain` is an [EventEmitter][event-emitter].
+
+## Class: MessagePortMain
+
+Process: [Main](../glossary.md#main-process)
+
+### Instance Methods
+
+#### `port.postMessage(message, [transfer])`
+
+* `message` any
+* `transfer` MessagePortMain[] (optional)
+
+Sends a message from the port, and optionally, transfers ownership of objects
+to other browsing contexts.
+
+#### `port.start()`
+
+Starts the sending of messages queued on the port. Messages will be queued
+until this method is called.
+
+#### `port.close()`
+
+Disconnects the port, so it is no longer active.
+
+### Instance Events
+
+#### Event: 'message'
+
+Returns:
+
+* `messageEvent` Object
+  * `data` any
+  * `ports` MessagePortMain[]
+
+Emitted when a MessagePortMain object receives a message.
+
+#### Event: 'close'
+
+Emitted when the remote end of a MessagePortMain object becomes disconnected.
+
+[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
+[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API
--- a/docs/api/modernization/promisification.md
+++ b/docs/api/modernization/promisification.md
@@ -1,17 +1,6 @@
 ## Promisification

-The Electron team is currently undergoing an initiative to convert callback-based functions in Electron to return Promises. During this transition period, both the callback and Promise-based versions of these functions will work correctly, and will both be documented.
-
-To enable deprecation warnings for these updated functions, use the [`process.enablePromiseAPIs` runtime flag](../process.md#processenablepromiseapis).
-
-When a majority of affected functions are migrated, this flag will be enabled by default and all developers will be able to see these deprecation warnings. At that time, the callback-based versions will also be removed from documentation. This document will be continuously updated as more functions are converted.
-
-### Candidate Functions
-
- [app.importCertificate(options, callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#importCertificate)
- [contents.print([options], [callback])](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#print)
-
-### Converted Functions
+The Electron team recently underwent an initiative to convert callback-based APIs to Promise-based ones. See converted functions below:

 - [app.getFileIcon(path[, options], callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#getFileIcon)
 - [contents.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#capturePage)
--- a/docs/api/modernization/property-updates.md
+++ b/docs/api/modernization/property-updates.md
@@ -5,14 +5,7 @@ The Electron team is currently undergoing an initiative to convert separate gett
 ## Candidates

 * `BrowserWindow`
-  * `fullscreen`
-  * `simpleFullscreen`
-  * `alwaysOnTop`
-  * `title`
-  * `documentEdited`
-  * `hasShadow`
  * `menubarVisible`
-  * `visibleOnAllWorkspaces`
 * `crashReporter` module
  * `uploadToServer`
 * `webFrame` modules
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -27,7 +27,7 @@ should use `themeSource` below.

 ### `nativeTheme.themeSource`

-A `String` property that can be `system`, `light` or `dark`.  It is used to override and supercede
+A `String` property that can be `system`, `light` or `dark`.  It is used to override and supersede
 the value that Chromium has chosen to use internally.

 Setting this property to `system` will remove the override and
--- a/docs/api/net-log.md
+++ b/docs/api/net-log.md
@@ -7,7 +7,7 @@ Process: [Main](../glossary.md#main-process)
 ```javascript
 const { netLog } = require('electron')

-app.on('ready', async () => {
+app.whenReady().then(async () => {
  await netLog.startLogging('/path/to/net-log')
  // After some network events
  const path = await netLog.stopLogging()
@@ -40,7 +40,7 @@ Starts recording network events to `path`.

 ### `netLog.stopLogging()`

-Returns `Promise<String>` - resolves with a file path to which network logs were recorded.
+Returns `Promise<void>` - resolves when the net log has been flushed to disk.

 Stops recording network events. If not called, net logging will automatically end when app quits.

@@ -48,8 +48,4 @@ Stops recording network events. If not called, net logging will automatically en

 ### `netLog.currentlyLogging` _Readonly_

-A `Boolean` property that indicates whether network logs are recorded.
-
-### `netLog.currentlyLoggingPath` _Readonly_ _Deprecated_
-
-A `String` property that returns the path to the current log file.
+A `Boolean` property that indicates whether network logs are currently being recorded.
--- a/docs/api/net.md
+++ b/docs/api/net.md
@@ -28,7 +28,7 @@ Example usage:

 ```javascript
 const { app } = require('electron')
-app.on('ready', () => {
+app.whenReady().then(() => {
  const { net } = require('electron')
  const request = net.request('https://github.com')
  request.on('response', (response) => {
--- a/docs/api/notification.md
+++ b/docs/api/notification.md
@@ -26,7 +26,7 @@ The `Notification` class has the following static methods:

 Returns `Boolean` - Whether or not desktop notifications are supported on the current system

-### `new Notification([options])` _Experimental_
+### `new Notification([options])`

 * `options` Object (optional)
  * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -4,39 +4,23 @@

 Process: [Main](../glossary.md#main-process)

-
-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
-For example:
-
-```javascript
-const { app, powerMonitor } = require('electron')
-
-app.on('ready', () => {
-  powerMonitor.on('suspend', () => {
-    console.log('The system is going to sleep')
-  })
-})
-```
-
 ## Events

 The `powerMonitor` module emits the following events:

-### Event: 'suspend' _macOS_ _Windows_
+### Event: 'suspend'

 Emitted when the system is suspending.

-### Event: 'resume' _macOS_ _Windows_
+### Event: 'resume'

 Emitted when system is resuming.

-### Event: 'on-ac' _macOS_ _Windows_
+### Event: 'on-ac' _Windows_

 Emitted when the system changes to AC power.

-### Event: 'on-battery' _macOS_  _Windows_
+### Event: 'on-battery' _Windows_

 Emitted when system changes to battery power.

--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -82,12 +82,6 @@ A `Boolean` that controls whether or not deprecation warnings are printed to `st
 Setting this to `true` will silence deprecation warnings. This property is used
 instead of the `--no-deprecation` command line flag.

-### `process.enablePromiseAPIs`
-
-A `Boolean` that controls whether or not deprecation warnings are printed to `stderr` when
-formerly callback-based APIs converted to Promises are invoked using callbacks. Setting this to `true`
-will enable deprecation warnings.
-
 ### `process.resourcesPath` _Readonly_

 A `String` representing the path to the resources directory.
@@ -117,7 +111,11 @@ A `Boolean` that controls whether or not process warnings printed to `stderr` in

 ### `process.type` _Readonly_

-A `String` representing the current process's type, can be `"browser"` (i.e. main process), `"renderer"`, or `"worker"` (i.e. web worker).
+A `String` representing the current process's type, can be:
+
+* `browser` - The main process
+* `renderer` - A renderer process
+* `worker` - In a web worker

 ### `process.versions.chrome` _Readonly_

--- a/docs/api/protocol-ns.md
+++ b/docs/api/protocol-ns.md
@@ -20,7 +20,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')

-app.on('ready', () => {
+app.whenReady().then(() => {
  protocol.registerFileProtocol('atom', (request, callback) => {
    const url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -47,7 +47,7 @@ to register it to that session explicitly.
 const { session, app, protocol } = require('electron')
 const path = require('path')

-app.on('ready', () => {
+app.whenReady().then(() => {
  const partition = 'persist:example'
  const ses = session.fromPartition(partition)

--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -11,7 +11,7 @@ An example of implementing a protocol that has the same effect as the
 const { app, protocol } = require('electron')
 const path = require('path')

-app.on('ready', () => {
+app.whenReady().then(() => {
  protocol.registerFileProtocol('atom', (request, callback) => {
    const url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
@@ -34,7 +34,7 @@ To have your custom protocol work in combination with a custom session, you need
 const { session, app, protocol } = require('electron')
 const path = require('path')

-app.on('ready', () => {
+app.whenReady().then(() => {
  const partition = 'persist:example'
  const ses = session.fromPartition(partition)

--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -163,7 +163,7 @@ project/
 ```js
 // main process: main/index.js
 const { app } = require('electron')
-app.on('ready', () => { /* ... */ })
+app.whenReady().then(() => { /* ... */ })
 ```

 ```js
--- a/docs/api/sandbox-option.md
+++ b/docs/api/sandbox-option.md
@@ -39,7 +39,7 @@ To create a sandboxed window, pass `sandbox: true` to `webPreferences`:

 ```js
 let win
-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow({
    webPreferences: {
      sandbox: true
@@ -51,15 +51,15 @@ app.on('ready', () => {

 In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
 only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
-within this new window `window.open` follows the native behaviour (by default Electron creates a [`BrowserWindow`](browser-window.md)
+within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
 and returns a proxy to this via `window.open`).

-[`app.enableSandbox`](app.md#appenablesandbox-experimental) can be used to force `sandbox: true` for all `BrowserWindow` instances.
+[`app.enableSandbox`](app.md#appenablesandbox) can be used to force `sandbox: true` for all `BrowserWindow` instances.

 ```js
 let win
 app.enableSandbox()
-app.on('ready', () => {
+app.whenReady().then(() => {
  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
  win = new BrowserWindow()
  win.loadURL('http://google.com')
@@ -73,7 +73,7 @@ Here's an example:

 ```js
 let win
-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow({
    webPreferences: {
      sandbox: true,
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -18,7 +18,7 @@ An example of creating a window that fills the whole screen:
 const { app, BrowserWindow, screen } = require('electron')

 let win
-app.on('ready', () => {
+app.whenReady().then(() => {
  const { width, height } = screen.getPrimaryDisplay().workAreaSize
  win = new BrowserWindow({ width, height })
  win.loadURL('https://github.com')
@@ -32,7 +32,7 @@ const { app, BrowserWindow, screen } = require('electron')

 let win

-app.on('ready', () => {
+app.whenReady().then(() => {
  let displays = screen.getAllDisplays()
  let externalDisplay = displays.find((display) => {
    return display.bounds.x !== 0 || display.bounds.y !== 0
--- a/docs/api/service-workers.md
+++ b/docs/api/service-workers.md
@@ -0,0 +1,62 @@
+## Class: ServiceWorkers
+
+> Query and receive events from a sessions active service workers.
+
+Process: [Main](../glossary.md#main-process)
+
+Instances of the `ServiceWorkers` class are accessed by using `serviceWorkers` property of
+a `Session`.
+
+For example:
+
+```javascript
+const { session } = require('electron')
+
+// Get all service workers.
+console.log(session.defaultSession.serviceWorkers.getAllRunning())
+
+// Handle logs and get service worker info
+session.defaultSession.serviceWorkers.on('console-message', (event, messageDetails) => {
+  console.log(
+    'Got service worker message',
+    messageDetails,
+    'from',
+    session.defaultSession.serviceWorkers.getFromVersionID(messageDetails.versionId)
+  )
+})
+```
+
+### Instance Events
+
+The following events are available on instances of `ServiceWorkers`:
+
+#### Event: 'console-message'
+
+Returns:
+
+* `event` Event
+* `messageDetails` Object - Information about the console message
+  * `message` String - The actual console message
+  * `versionId` Number - The version ID of the service worker that sent the log message
+  * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
+  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
+  * `sourceUrl` String - The URL the message came from
+  * `lineNumber` Number - The line number of the source that triggered this console message
+
+Emitted when a service worker logs something to the console.
+
+### Instance Methods
+
+The following methods are available on instances of `ServiceWorkers`:
+
+#### `serviceWorkers.getAllRunning()`
+
+Returns `Record<Number, ServiceWorkerInfo>` - A [ServiceWorkerInfo](structures/service-worker-info.md) object where the keys are the service worker version ID and the values are the information about that service worker.
+
+#### `serviceWorkers.getFromVersionID(versionId)`
+
+* `versionId` Number
+
+Returns [`ServiceWorkerInfo`](structures/service-worker-info.md) - Information about this service worker
+
+If the service worker does not exist or is not running this method will throw an exception.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -165,9 +165,10 @@ Clears the session’s HTTP cache.
    `scheme://host:port`.
  * `storages` String[] (optional) - The types of storages to clear, can contain:
    `appcache`, `cookies`, `filesystem`, `indexdb`, `localstorage`,
-    `shadercache`, `websql`, `serviceworkers`, `cachestorage`.
+    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
+    specified, clear all storage types.
  * `quotas` String[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `persistent`, `syncable`.
+    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.

 Returns `Promise<void>` - resolves when the storage data has been cleared.

@@ -310,6 +311,7 @@ the original network configuration.
  * `request` Object
    * `hostname` String
    * `certificate` [Certificate](structures/certificate.md)
+    * `validatedCertificate` [Certificate](structures/certificate.md)
    * `verificationResult` String - Verification result from chromium.
    * `errorCode` Integer - Error code.
  * `callback` Function
@@ -437,6 +439,13 @@ example `"en-US,fr,de,ko,zh-CN,ja"`.
 This doesn't affect existing `WebContents`, and each `WebContents` can use
 `webContents.setUserAgent` to override the session-wide user agent.

+#### `ses.isPersistent()`
+
+Returns `Boolean` - Whether or not this session is a persistent one. The default
+`webContents` session of a `BrowserWindow` is persistent. When creating a session
+from a partition, session prefixed with `persist:` will be persistent, while others
+will be temporary.
+
 #### `ses.getUserAgent()`

 Returns `String` - The user agent for this session.
@@ -477,9 +486,7 @@ event. The [DownloadItem](download-item.md) will not have any `WebContents` asso
 the initial state will be `interrupted`. The download will start only when the
 `resume` API is called on the [DownloadItem](download-item.md).

-#### `ses.clearAuthCache(options)`
-
-* `options` ([RemovePassword](structures/remove-password.md) | [RemoveClientCertificate](structures/remove-client-certificate.md))
+#### `ses.clearAuthCache()`

 Returns `Promise<void>` - resolves when the session’s HTTP authentication cache has been cleared.

@@ -529,14 +536,93 @@ note the trailing slash.  The URL to the dictionaries is formed as `${url}${file

 **Note:** On macOS the OS spellchecker is used and therefore we do not download any dictionary files.  This API is a no-op on macOS.

+#### `ses.listWordsInSpellCheckerDictionary()`
+
+Returns `Promise<String[]>` - An array of all words in app's custom dictionary.
+Resolves when the full dictionary is loaded from disk.
+
 #### `ses.addWordToSpellCheckerDictionary(word)`

 * `word` String - The word you want to add to the dictionary

-Returns `Boolean` - Whether the word was successfully written to the custom dictionary.
+Returns `Boolean` - Whether the word was successfully written to the custom dictionary. This API
+will not work on non-persistent (in-memory) sessions.

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

+#### `ses.removeWordFromSpellCheckerDictionary(word)`
+
+* `word` String - The word you want to remove from the dictionary
+
+Returns `Boolean` - Whether the word was successfully removed from the custom dictionary. This API
+will not work on non-persistent (in-memory) sessions.
+
+**Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well
+
+#### `ses.loadExtension(path)`
+
+* `path` String - Path to a directory containing an unpacked Chrome extension
+
+Returns `Promise<Extension>` - resolves when the extension is loaded.
+
+This method will raise an exception if the extension could not be loaded. If
+there are warnings when installing the extension (e.g. if the extension
+requests an API that Electron does not support) then they will be logged to the
+console.
+
+Note that Electron does not support the full range of Chrome extensions APIs.
+See [Supported Extensions APIs](extensions.md#supported-extensions-apis) for
+more details on what is supported.
+
+Note that in previous versions of Electron, extensions that were loaded would
+be remembered for future runs of the application. This is no longer the case:
+`loadExtension` must be called on every boot of your app if you want the
+extension to be loaded.
+
+```js
+const { app, session } = require('electron')
+const path = require('path')
+
+app.on('ready', async () => {
+  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
+  // Note that in order to use the React DevTools extension, you'll need to
+  // download and unzip a copy of the extension.
+})
+```
+
+This API does not support loading packed (.crx) extensions.
+
+**Note:** This API cannot be called before the `ready` event of the `app` module
+is emitted.
+
+**Note:** Loading extensions into in-memory (non-persistent) sessions is not
+supported and will throw an error.
+
+#### `ses.removeExtension(extensionId)`
+
+* `extensionId` String - ID of extension to remove
+
+Unloads an extension.
+
+**Note:** This API cannot be called before the `ready` event of the `app` module
+is emitted.
+
+#### `ses.getExtension(extensionId)`
+
+* `extensionId` String - ID of extension to query
+
+Returns `Extension` | `null` - The loaded extension with the given ID.
+
+**Note:** This API cannot be called before the `ready` event of the `app` module
+is emitted.
+
+#### `ses.getAllExtensions()`
+
+Returns `Extension[]` - A list of all loaded extensions.
+
+**Note:** This API cannot be called before the `ready` event of the `app` module
+is emitted.
+
 ### Instance Properties

 The following properties are available on instances of `Session`:
@@ -550,6 +636,10 @@ code to the `setSpellCheckerLanaguages` API that isn't in this array will result

 A [`Cookies`](cookies.md) object for this session.

+#### `ses.serviceWorkers` _Readonly_
+
+A [`ServiceWorkers`](service-workers.md) object for this session.
+
 #### `ses.webRequest` _Readonly_

 A [`WebRequest`](web-request.md) object for this session.
@@ -562,12 +652,12 @@ A [`Protocol`](protocol.md) object for this session.
 const { app, session } = require('electron')
 const path = require('path')

-app.on('ready', function () {
+app.whenReady().then(() => {
  const protocol = session.fromPartition('some-partition').protocol
-  protocol.registerFileProtocol('atom', function (request, callback) {
-    var url = request.url.substr(7)
+  protocol.registerFileProtocol('atom', (request, callback) => {
+    let url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
-  }, function (error) {
+  }, (error) => {
    if (error) console.error('Failed to register protocol')
  })
 })
@@ -580,7 +670,7 @@ A [`NetLog`](net-log.md) object for this session.
 ```javascript
 const { app, session } = require('electron')

-app.on('ready', async function () {
+app.whenReady().then(async () => {
  const netLog = session.fromPartition('some-partition').netLog
  netLog.startLogging('/path/to/net-log')
  // After some network events
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -2,7 +2,7 @@

 > Manage files and URLs using their default applications.

-Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process)
+Process: [Main](../glossary.md#main-process), [Renderer](../glossary.md#renderer-process) (non-sandboxed only)

 The `shell` module provides functions related to desktop integration.

@@ -14,6 +14,8 @@ const { shell } = require('electron')
 shell.openExternal('https://github.com')
 ```

+**Note:** While the `shell` module can be used in the renderer process, it will not function in a sandboxed renderer.
+
 ## Methods

 The `shell` module has the following methods:
@@ -24,11 +26,11 @@ The `shell` module has the following methods:

 Show the given file in a file manager. If possible, select the file.

-### `shell.openItem(fullPath)`
+### `shell.openPath(path)`

-* `fullPath` String
+* `path` String

-Returns `Boolean` - Whether the item was successfully opened.
+Returns `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".

 Open the given file in the desktop's default manner.

--- a/docs/api/structures/cookie.md
+++ b/docs/api/structures/cookie.md
@@ -12,3 +12,4 @@
 * `expirationDate` Double (optional) - The expiration date of the cookie as
  the number of seconds since the UNIX epoch. Not provided for session
  cookies.
+* `sameSite` String - The [Same Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#SameSite_cookies) policy applied to this cookie.  Can be `unspecified`, `no_restriction`, `lax` or `strict`.
--- a/docs/api/structures/extension.md
+++ b/docs/api/structures/extension.md
@@ -0,0 +1,8 @@
+# Extension Object
+
+* `id` String
+* `manifest` any - Copy of the [extension's manifest data](https://developer.chrome.com/extensions/manifest).
+* `name` String
+* `path` String - The extension's file path.
+* `version` String
+* `url` String - The extension's `chrome-extension://` URL.
--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -3,5 +3,7 @@
 * `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
+* `ports` MessagePortMain[] - A list of MessagePorts that were transferred with this message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
+  * `channel` String
  * `...args` any[]
--- a/docs/api/structures/ipc-renderer-event.md
+++ b/docs/api/structures/ipc-renderer-event.md
@@ -2,5 +2,6 @@

 * `sender` IpcRenderer - The `IpcRenderer` instance that emitted the event originally
 * `senderId` Integer - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
+* `ports` MessagePort[] - A list of MessagePorts that were transferred with this message

 [ipc-renderer-sendto]: #ipcrenderersendtowindowid-channel--arg1-arg2-
--- a/docs/api/structures/new-window-event.md
+++ b/docs/api/structures/new-window-event.md
@@ -1,4 +0,0 @@
-# NewWindowEvent Object extends `Event`
-
-* `newGuest` BrowserWindow (optional)
-
--- a/docs/api/structures/post-body.md
+++ b/docs/api/structures/post-body.md
@@ -0,0 +1,23 @@
+# PostBody Object
+
+* `data` Array<[PostData](./post-data.md)> - The post data to be sent to the
+  new window.
+* `contentType` String - The `content-type` header used for the data. One of
+  `application/x-www-form-urlencoded` or `multipart/form-data`. Corresponds to
+  the `enctype` attribute of the submitted HTML form.
+* `boundary` String (optional) - The boundary used to separate multiple parts of
+  the message. Only valid when `contentType` is `multipart/form-data`.
+
+Note that keys starting with `--` are not currently supported. For example, this will errantly submit as `multipart/form-data` when `nativeWindowOpen` is set to `false` in webPreferences:
+
+```html
+<form
+  target="_blank"
+  method="POST"
+  enctype="application/x-www-form-urlencoded"
+  action="https://postman-echo.com/post"
+>
+  <input type="text" name="--theKey">
+  <input type="submit">
+</form>
+```
--- a/docs/api/structures/post-data.md
+++ b/docs/api/structures/post-data.md
@@ -0,0 +1,21 @@
+# PostData Object
+
+* `type` String - One of the following:
+  * `rawData` - The data is available as a `Buffer`, in the `rawData` field.
+  * `file` - The object represents a file. The `filePath`, `offset`, `length`
+    and `modificationTime` fields will be used to describe the file.
+  * `blob` - The object represents a `Blob`. The `blobUUID` field will be used
+    to describe the `Blob`.
+* `bytes` String (optional) - The raw bytes of the post data in a `Buffer`.
+  Required for the `rawData` type.
+* `filePath` String (optional) - The path of the file being uploaded. Required
+  for the `file` type.
+* `blobUUID` String (optional) - The `UUID` of the `Blob` being uploaded.
+  Required for the `blob` type.
+* `offset` Integer (optional) - The offset from the beginning of the file being
+  uploaded, in bytes. Only valid for `file` types.
+* `length` Integer (optional) - The length of the file being uploaded, in bytes.
+  If set to `-1`, the whole file will be uploaded. Only valid for `file` types.
+* `modificationTime` Double (optional) - The modification time of the file
+  represented by a double, which is the number of seconds since the `UNIX Epoch`
+  (Jan 1, 1970). Only valid for `file` types.
--- a/docs/api/structures/printer-info.md
+++ b/docs/api/structures/printer-info.md
@@ -1,9 +1,13 @@
 # PrinterInfo Object

-* `name` String
-* `description` String
-* `status` Number
-* `isDefault` Boolean
+* `name` String - the name of the printer as understood by the OS.
+* `displayName` String - the name of the printer as shown in Print Preview.
+* `description` String - a longer description of the printer's type.
+* `status` Number - the current status of the printer.
+* `isDefault` Boolean - whether or not a given printer is set as the default printer on the OS.
+* `options` Object - an object containing a variable number of platform-specific printer information.
+
+The number represented by `status` means different things on different platforms: on Windows it's potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).

 ## Example

@@ -12,13 +16,14 @@ may be different on each platform.

 ```javascript
 {
-  name: 'Zebra_LP2844',
-  description: 'Zebra LP2844',
+  name: 'Austin_4th_Floor_Printer___C02XK13BJHD4',
+  displayName: 'Austin 4th Floor Printer @ C02XK13BJHD4',
+  description: 'TOSHIBA ColorMFP',
  status: 3,
  isDefault: false,
  options: {
    copies: '1',
-    'device-uri': 'usb://Zebra/LP2844?location=14200000',
+    'device-uri': 'dnssd://Austin%204th%20Floor%20Printer%20%40%20C02XK13BJHD4._ipps._tcp.local./?uuid=71687f1e-1147-3274-6674-22de61b110bd',
    finishings: '3',
    'job-cancel-after': '10800',
    'job-hold-until': 'no-hold',
@@ -26,18 +31,19 @@ may be different on each platform.
    'job-sheets': 'none,none',
    'marker-change-time': '0',
    'number-up': '1',
-    'printer-commands': 'none',
-    'printer-info': 'Zebra LP2844',
+    'printer-commands': 'ReportLevels,PrintSelfTestPage,com.toshiba.ColourProfiles.update,com.toshiba.EFiling.update,com.toshiba.EFiling.checkPassword',
+    'printer-info': 'Austin 4th Floor Printer @ C02XK13BJHD4',
    'printer-is-accepting-jobs': 'true',
-    'printer-is-shared': 'true',
+    'printer-is-shared': 'false',
+    'printer-is-temporary': 'false',
    'printer-location': '',
-    'printer-make-and-model': 'Zebra EPL2 Label Printer',
+    'printer-make-and-model': 'TOSHIBA ColorMFP',
    'printer-state': '3',
-    'printer-state-change-time': '1484872644',
-    'printer-state-reasons': 'offline-report',
-    'printer-type': '36932',
-    'printer-uri-supported': 'ipp://localhost/printers/Zebra_LP2844',
-    system_driverinfo: 'Z'
+    'printer-state-change-time': '1573472937',
+    'printer-state-reasons': 'offline-report,com.toshiba.snmp.failed',
+    'printer-type': '10531038',
+    'printer-uri-supported': 'ipp://localhost/printers/Austin_4th_Floor_Printer___C02XK13BJHD4',
+    system_driverinfo: 'T'
  }
 }
 ```
--- a/docs/api/structures/remove-client-certificate.md
+++ b/docs/api/structures/remove-client-certificate.md
@@ -1,5 +0,0 @@
-# RemoveClientCertificate Object
-
-* `type` String - `clientCertificate`.
-* `origin` String - Origin of the server whose associated client certificate
-  must be removed from the cache.
--- a/docs/api/structures/remove-password.md
+++ b/docs/api/structures/remove-password.md
@@ -1,15 +0,0 @@
-# RemovePassword Object
-
-* `type` String - `password`.
-* `origin` String (optional) - When provided, the authentication info
-  related to the origin will only be removed otherwise the entire cache
-  will be cleared.
-* `scheme` String (optional) - Scheme of the authentication.
-  Can be `basic`, `digest`, `ntlm`, `negotiate`. Must be provided if
-  removing by `origin`.
-* `realm` String (optional) - Realm of the authentication. Must be provided if
-  removing by `origin`.
-* `username` String (optional) - Credentials of the authentication. Must be
-  provided if removing by `origin`.
-* `password` String (optional) - Credentials of the authentication. Must be
-  provided if removing by `origin`.
--- a/docs/api/structures/service-worker-info.md
+++ b/docs/api/structures/service-worker-info.md
@@ -0,0 +1,5 @@
+# ServiceWorkerInfo Object
+
+* `scriptUrl` String - The full URL to the script that this service worker runs
+* `scope` String - The base URL that this service worker is active for.
+* `renderProcessId` Number - The virtual ID of the process that this service worker is running in.  This is not an OS level PID.  This aligns with the ID set used for `webContents.getProcessId()`.
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -22,7 +22,7 @@ The main process script is like a normal Node.js script:
 const { app, BrowserWindow } = require('electron')
 let win = null

-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow({ width: 800, height: 600 })
  win.loadURL('https://github.com')
 })
@@ -56,7 +56,7 @@ const { app, BrowserWindow } = require('electron')

 let win

-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
@@ -71,7 +71,7 @@ const { app, BrowserWindow } = electron

 let win

-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
@@ -85,7 +85,7 @@ const app = electron.app
 const BrowserWindow = electron.BrowserWindow
 let win

-app.on('ready', () => {
+app.whenReady().then(() => {
  win = new BrowserWindow()
  win.loadURL('https://github.com')
 })
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -326,7 +326,7 @@ This API is only available on macOS 10.14 Mojave or newer.
    * `window-frame-text` - The text in the window's titlebar area.

 Returns `String` - The system color setting in RGB hexadecimal form (`#ABCDEF`).
-See the [Windows docs][windows-colors] and the [MacOS docs][macos-colors] for more details.
+See the [Windows docs][windows-colors] and the [macOS docs][macos-colors] for more details.

 The following colors are only available on macOS 10.14: `find-highlight`, `selected-content-background`, `separator`, `unemphasized-selected-content-background`, `unemphasized-selected-text-background`, and `unemphasized-selected-text`.

@@ -416,7 +416,7 @@ This API itself will not protect your user data; rather, it is a mechanism to al

 Returns `Boolean` - `true` if the current process is a trusted accessibility client and `false` if it is not.

-### `systemPreferences.getMediaAccessStatus(mediaType)` _Windows_ _macOS_
+### `systemPreferences.getMediaAccessStatus(mediaType)` _macOS_

 * `mediaType` String - Can be `microphone`, `camera` or `screen`.

@@ -426,9 +426,6 @@ This user consent was not required on macOS 10.13 High Sierra or lower so this m
 macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
 macOS 10.15 Catalina or higher requires consent for `screen` access.

-Windows 10 has a global setting controlling `microphone` and `camera` access for all win32 applications.
-It will always return `granted` for `screen` and for all media types on older versions of Windows.
-
 ### `systemPreferences.askForMediaAccess(mediaType)` _macOS_

 * `mediaType` String - the type of media being requested; can be `microphone`, `camera`.
--- a/docs/api/touch-bar-button.md
+++ b/docs/api/touch-bar-button.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarButton(options)` _Experimental_
+### `new TouchBarButton(options)`

 * `options` Object
  * `label` String (optional) - Button text.
@@ -14,6 +14,7 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
  * `icon` [NativeImage](native-image.md) | String (optional) - Button icon.
  * `iconPosition` String (optional) - Can be `left`, `right` or `overlay`. Defaults to `overlay`.
  * `click` Function (optional) - Function to call when the button is clicked.
+  * `enabled` Boolean (optional) - Whether the button is in an enabled state.  Default is `true`.

 When defining `accessibilityLabel`, ensure you have considered macOS [best practices](https://developer.apple.com/documentation/appkit/nsaccessibilitybutton/1524910-accessibilitylabel?language=objc).

@@ -39,3 +40,7 @@ the button in the touch bar.

 A `NativeImage` representing the button's current icon. Changing this value immediately updates the button
 in the touch bar.
+
+#### `touchBarButton.enabled`
+
+A `Boolean` representing whether the button is in an enabled state.
--- a/docs/api/touch-bar-color-picker.md
+++ b/docs/api/touch-bar-color-picker.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarColorPicker(options)` _Experimental_
+### `new TouchBarColorPicker(options)`

 * `options` Object
  * `availableColors` String[] (optional) - Array of hex color strings to
--- a/docs/api/touch-bar-group.md
+++ b/docs/api/touch-bar-group.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarGroup(options)` _Experimental_
+### `new TouchBarGroup(options)`

 * `options` Object
  * `items` [TouchBar](touch-bar.md) - Items to display as a group.
--- a/docs/api/touch-bar-label.md
+++ b/docs/api/touch-bar-label.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarLabel(options)` _Experimental_
+### `new TouchBarLabel(options)`

 * `options` Object
  * `label` String (optional) - Text to display.
--- a/docs/api/touch-bar-other-items-proxy.md
+++ b/docs/api/touch-bar-other-items-proxy.md
@@ -0,0 +1,12 @@
+## Class: TouchBarOtherItemsProxy
+
+> Instantiates a special "other items proxy", which nests TouchBar elements inherited
+> from Chromium at the space indicated by the proxy. By default, this proxy is added
+> to each TouchBar at the end of the input. For more information, see the AppKit docs on
+> [NSTouchBarItemIdentifierOtherItemsProxy](https://developer.apple.com/documentation/appkit/nstouchbaritemidentifierotheritemsproxy)
+>
+> Note: Only one instance of this class can be added per TouchBar.
+
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)
+
+### `new TouchBarOtherItemsProxy()`
--- a/docs/api/touch-bar-popover.md
+++ b/docs/api/touch-bar-popover.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarPopover(options)` _Experimental_
+### `new TouchBarPopover(options)`

 * `options` Object
  * `label` String (optional) - Popover button text.
--- a/docs/api/touch-bar-scrubber.md
+++ b/docs/api/touch-bar-scrubber.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarScrubber(options)` _Experimental_
+### `new TouchBarScrubber(options)`

 * `options` Object
  * `items` [ScrubberItem[]](structures/scrubber-item.md) - An array of items to place in this scrubber.
--- a/docs/api/touch-bar-segmented-control.md
+++ b/docs/api/touch-bar-segmented-control.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarSegmentedControl(options)` _Experimental_
+### `new TouchBarSegmentedControl(options)`

 * `options` Object
  * `segmentStyle` String (optional) - Style of the segments:
--- a/docs/api/touch-bar-slider.md
+++ b/docs/api/touch-bar-slider.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarSlider(options)` _Experimental_
+### `new TouchBarSlider(options)`

 * `options` Object
  * `label` String (optional) - Label text.
--- a/docs/api/touch-bar-spacer.md
+++ b/docs/api/touch-bar-spacer.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBarSpacer(options)` _Experimental_
+### `new TouchBarSpacer(options)`

 * `options` Object
  * `size` String (optional) - Size of spacer, possible values are:
--- a/docs/api/touch-bar.md
+++ b/docs/api/touch-bar.md
@@ -4,7 +4,7 @@

 Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

-### `new TouchBar(options)` _Experimental_
+### `new TouchBar(options)`

 * `options` Object
  * `items` ([TouchBarButton](touch-bar-button.md) | [TouchBarColorPicker](touch-bar-color-picker.md) | [TouchBarGroup](touch-bar-group.md) | [TouchBarLabel](touch-bar-label.md) | [TouchBarPopover](touch-bar-popover.md) | [TouchBarScrubber](touch-bar-scrubber.md) | [TouchBarSegmentedControl](touch-bar-segmented-control.md) | [TouchBarSlider](touch-bar-slider.md) | [TouchBarSpacer](touch-bar-spacer.md))[] (optional)
@@ -58,6 +58,10 @@ A [`typeof TouchBarSlider`](./touch-bar-slider.md) reference to the `TouchBarSli

 A [`typeof TouchBarSpacer`](./touch-bar-spacer.md) reference to the `TouchBarSpacer` class.

+#### `TouchBarOtherItemsProxy`
+
+A [`typeof TouchBarOtherItemsProxy`](./touch-bar-other-items-proxy.md) reference to the `TouchBarOtherItemsProxy` class.
+
 ### Instance Properties

 The following properties are available on instances of `TouchBar`:
@@ -166,7 +170,7 @@ const touchBar = new TouchBar({

 let window

-app.once('ready', () => {
+app.whenReady().then(() => {
  window = new BrowserWindow({
    frame: false,
    titleBarStyle: 'hiddenInset',
--- a/Show More
+++ b/Show More