Bump v8.0.0-nightly.20190825

Bump v8.0.0-nightly.20190824
chore: bump chromium to 62327c655093c821aa0fcfc6db53f5fd943e08c7 (master) (#19792 )
2026-04-10 03:01:51 -04:00 · 2019-08-25 08:31:03 -07:00 · 2019-08-24 08:31:28 -07:00 · 2019-08-23 18:14:23 -07:00 · 2019-08-23 15:49:54 -07:00 · 2019-08-23 15:48:27 -07:00
236 changed files with 2571 additions and 1570 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,13 +91,19 @@ env-linux-medium: &env-linux-medium
  NUMBER_OF_NINJA_PROCESSES: 3

 env-linux-2xlarge: &env-linux-2xlarge
-  NUMBER_OF_NINJA_PROCESSES: 18
+  NUMBER_OF_NINJA_PROCESSES: 34
+  
+env-linux-2xlarge-release: &env-linux-2xlarge-release
+  NUMBER_OF_NINJA_PROCESSES: 16

 env-machine-mac: &env-machine-mac
  NUMBER_OF_NINJA_PROCESSES: 6

 env-mac-large: &env-mac-large
-  NUMBER_OF_NINJA_PROCESSES: 10
+  NUMBER_OF_NINJA_PROCESSES: 18
+
+env-mac-large-release: &env-mac-large-release
+  NUMBER_OF_NINJA_PROCESSES: 8

 env-disable-crash-reporter-tests: &env-disable-crash-reporter-tests
  DISABLE_CRASH_REPORTER_TESTS: true
@@ -186,6 +192,13 @@ step-restore-brew-cache: &step-restore-brew-cache
    keys:
      - v1-brew-cache-{{ arch }}

+step-save-brew-cache: &step-save-brew-cache
+  save_cache:
+    paths:
+      - /usr/local/Homebrew
+    key: v1-brew-cache-{{ arch }}
+    name: Persisting brew cache
+
 step-get-more-space-on-mac: &step-get-more-space-on-mac
  run:
    name: Free up space on MacOS
@@ -535,6 +548,93 @@ step-ninja-summary: &step-ninja-summary
    command: |
      python depot_tools/post_build_ninja_summary.py -C src/out/Default

+# Checkout Steps
+step-generate-deps-hash: &step-generate-deps-hash
+  run:
+    name: Generate DEPS Hash
+    command: node src/electron/script/generate-deps-hash.js
+
+step-touch-sync-done: &step-touch-sync-done
+  run:
+    name: Touch Sync Done
+    command: touch src/electron/.circle-sync-done
+
+# Restore exact src cache based on the hash of DEPS and patches/*
+# If no cache is matched EXACTLY then the .circle-sync-done file is empty
+# If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
+step-maybe-restore-src-cache: &step-maybe-restore-src-cache
+  restore_cache:
+    paths:
+      - ./src
+    keys:
+      - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+    name: Restoring src cache
+
+# Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
+# If the src cache was restored above then this will match an empty cache
+# If the src cache was not restored above then this will match a close git cache
+step-maybe-restore-git-cache: &step-maybe-restore-git-cache
+  restore_cache:
+    paths:
+      - ~/.gclient-cache
+    keys:
+      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+      - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
+    name: Conditionally restoring git cache
+
+step-set-git-cache-path: &step-set-git-cache-path
+  run:
+    name: Set GIT_CACHE_PATH to make gclient to use the cache
+    command: |
+      # CircleCI does not support interpolation when setting environment variables.
+      # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
+      echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
+
+# Persist the git cache based on the hash of DEPS and .circle-sync-done
+# If the src cache was restored above then this will persist an empty cache
+step-save-git-cache: &step-save-git-cache
+  save_cache:
+    paths:
+      - ~/.gclient-cache
+    key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+    name: Persisting git cache
+
+step-run-electron-only-hooks: &step-run-electron-only-hooks
+  run:
+    name: Run Electron Only Hooks
+    command: gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
+
+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
+
+# Mark the sync as done for future cache saving
+step-mark-sync-done: &step-mark-sync-done
+  run:
+    name: Mark Sync Done
+    command: echo DONE > src/electron/.circle-sync-done
+
+# Minimize the size of the cache
+step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-checkout
+  run:
+    name: Remove some unused data to avoid storing it in the workspace/cache
+    command: |
+      rm -rf src/android_webview
+      rm -rf src/ios
+      rm -rf src/third_party/blink/web_tests
+      rm -rf src/third_party/blink/perf_tests
+      rm -rf src/third_party/hunspell_dictionaries
+      rm -rf src/third_party/WebKit/LayoutTests
+
+# Save the src cache based on the deps hash
+step-save-src-cache: &step-save-src-cache
+  save_cache:
+    paths:
+      - ./src
+    key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
+    name: Persisting src cache
+
 # Lists of steps.
 steps-lint: &steps-lint
  steps:
@@ -580,7 +680,7 @@ steps-lint: &steps-lint
          node script/yarn install --frozen-lockfile
          node script/yarn lint

-steps-checkout: &steps-checkout
+steps-checkout-fast: &steps-checkout-fast
  steps:
    - *step-checkout-electron
    - *step-depot-tools-get
@@ -589,88 +689,57 @@ steps-checkout: &steps-checkout
    - *step-get-more-space-on-mac
    - *step-install-gnutar-on-mac

-    - run:
-        name: Generate DEPS Hash
-        command: node src/electron/script/generate-deps-hash.js
-    - run:
-        name: Touch Sync Done
-        command: touch src/electron/.circle-sync-done
-    # Restore exact src cache based on the hash of DEPS and patches/*
-    # If no cache is matched EXACTLY then the .circle-sync-done file is empty
-    # If a cache is matched EXACTLY then the .circle-sync-done file contains "done"
-    - restore_cache:
-        paths:
-          - ./src
-        keys:
-          - v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Restoring src cache
-    # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will match an empty cache
-    # If the src cache was not restored above then this will match a close git cache
-    - restore_cache:
-        paths:
-          - ~/.gclient-cache
-        keys:
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-          - v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}
-        name: Conditionally restoring git cache
-    - run:
-        name: Set GIT_CACHE_PATH to make gclient to use the cache
-        command: |
-          # CircleCI does not support interpolation when setting environment variables.
-          # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
-          echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - *step-maybe-restore-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
    # This sync call only runs if .circle-sync-done is an EMPTY file
    - *step-gclient-sync
-    # Persist the git cache based on the hash of DEPS and .circle-sync-done
-    # If the src cache was restored above then this will persist an empty cache
-    - save_cache:
-        paths:
-          - ~/.gclient-cache
-        key: v2-gclient-cache-{{ arch }}-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-        name: Persisting git cache
    # These next few steps reset Electron to the correct commit regardless of which cache was restored
    - run:
        name: Wipe Electron
        command: rm -rf src/electron
    - *step-checkout-electron
-    - run:
-        name: Run Electron Only Hooks
-        command: gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
-    - run:
-        name: Generate DEPS Hash
-        command: (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
-    # Mark the sync as done for future cache saving
-    - run:
-        name: Mark Sync Done
-        command: echo DONE > src/electron/.circle-sync-done
-    # Minimize the size of the cache
-    - run:
-        name: Remove some unused data to avoid storing it in the workspace/cache
-        command: |
-          rm -rf src/android_webview
-          rm -rf src/ios
-          rm -rf src/third_party/blink/web_tests
-          rm -rf src/third_party/blink/perf_tests
-          rm -rf src/third_party/hunspell_dictionaries
-          rm -rf src/third_party/WebKit/LayoutTests
-    # Save the src cache based on the deps hash
-    - save_cache:
-        paths:
-          - ./src
-        key: v5-src-cache-{{ arch }}-{{ checksum "src/electron/.depshash" }}
-        name: Persisting src cache
-    - save_cache:
-        paths:
-          - /usr/local/Homebrew
-        key: v1-brew-cache-{{ arch }}
-        name: Persisting brew cache
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
    - persist_to_workspace:
        root: .
        paths:
          - depot_tools
          - src

+steps-checkout-and-save-cache: &steps-checkout-and-save-cache
+  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-install-gnutar-on-mac
+
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - *step-maybe-restore-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
+    # This sync call only runs if .circle-sync-done is an EMPTY file
+    - *step-gclient-sync
+    - *step-save-git-cache
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
+    - *step-save-src-cache
+    - *step-save-brew-cache
+
 steps-electron-gn-check: &steps-electron-gn-check
  steps:
    - attach_workspace:
@@ -707,9 +776,11 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
    - *step-restore-brew-cache
+    - *step-get-more-space-on-mac
    - *step-install-npm-deps-on-mac
    - *step-fix-sync-on-mac
    - *step-gn-gen-default
+    - *step-delete-git-directories

    # Electron app
    - *step-electron-build
@@ -947,33 +1018,47 @@ jobs:
    <<: *steps-lint

  # Layer 1: Checkout.
-  linux-checkout:
+  linux-checkout-fast:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    <<: *steps-checkout
+    <<: *steps-checkout-fast
+
+  linux-checkout-and-save-cache:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    <<: *steps-checkout-and-save-cache

  linux-checkout-for-native-tests:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
-    <<: *steps-checkout
+    <<: *steps-checkout-fast

  linux-checkout-for-native-tests-with-no-patches:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
-    <<: *steps-checkout
+    <<: *steps-checkout-fast

-  mac-checkout:
+  mac-checkout-fast:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    <<: *steps-checkout
+    <<: *steps-checkout-fast
+
+  mac-checkout-and-save-cache:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    <<: *steps-checkout-and-save-cache

  # Layer 2: Builds.
  linux-x64-debug:
@@ -1040,7 +1125,7 @@ jobs:
  linux-x64-publish:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      <<: *env-release-build
    <<: *steps-electron-build-for-publish
@@ -1089,7 +1174,7 @@ jobs:
  linux-ia32-publish:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      <<: *env-ia32
      <<: *env-release-build
@@ -1140,7 +1225,7 @@ jobs:
  linux-arm-publish:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
      <<: *env-arm
      <<: *env-release-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
@@ -1207,7 +1292,7 @@ jobs:
  linux-arm64-publish:
    <<: *machine-linux-2xlarge
    environment:
-      <<: *env-linux-2xlarge
+      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
@@ -1222,6 +1307,15 @@ jobs:
      <<: *env-ninja-status
    <<: *steps-electron-build-for-tests

+  osx-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build-for-tests    
+
  osx-debug-gn-check:
    <<: *machine-mac
    environment:
@@ -1257,7 +1351,7 @@ jobs:
  osx-publish:
    <<: *machine-mac-large
    environment:
-      <<: *env-mac-large
+      <<: *env-mac-large-release
      <<: *env-release-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
    <<: *steps-electron-build-for-publish
@@ -1272,6 +1366,16 @@ jobs:
      <<: *env-ninja-status
    <<: *steps-electron-build-for-tests

+  mas-debug:
+    <<: *machine-mac-large
+    environment:
+      <<: *env-mac-large
+      <<: *env-mas
+      <<: *env-debug-build
+      <<: *env-enable-sccache
+      <<: *env-ninja-status
+    <<: *steps-electron-build-for-tests
+
  mas-debug-gn-check:
    <<: *machine-mac
    environment:
@@ -1310,7 +1414,7 @@ jobs:
  mas-publish:
    <<: *machine-mac-large
    environment:
-      <<: *env-mac-large
+      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
@@ -1575,23 +1679,24 @@ workflows:

  build-linux:
    jobs:
-      - linux-checkout
+      - linux-checkout-fast
+      - linux-checkout-and-save-cache

      - linux-x64-debug:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-x64-debug-gn-check:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-x64-testing:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-x64-testing-no-run-as-node:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-x64-testing-gn-check:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-x64-testing-tests:
          requires:
            - linux-x64-testing
@@ -1604,10 +1709,10 @@ workflows:

      - linux-ia32-debug:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-ia32-testing:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-ia32-testing-tests:
          requires:
            - linux-ia32-testing
@@ -1620,37 +1725,44 @@ workflows:

      - linux-arm-debug:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-arm-testing:
          requires:
-            - linux-checkout
+            - linux-checkout-fast

      - linux-arm64-debug:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-arm64-debug-gn-check:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-arm64-testing:
          requires:
-            - linux-checkout
+            - linux-checkout-fast
      - linux-arm64-testing-gn-check:
          requires:
-            - linux-checkout
+            - linux-checkout-fast

  build-mac:
    jobs:
-      - mac-checkout
+      - mac-checkout-fast
+      - mac-checkout-and-save-cache
+
      - osx-testing:
          requires:
-            - mac-checkout
+            - mac-checkout-fast
+
+      - osx-debug:
+          requires:
+            - mac-checkout-fast

      - osx-debug-gn-check:
          requires:
-            - mac-checkout
+            - mac-checkout-fast
+
      - osx-testing-gn-check:
          requires:
-            - mac-checkout
+            - mac-checkout-fast

      - osx-testing-tests:
          requires:
@@ -1658,14 +1770,19 @@ workflows:

      - mas-testing:
          requires:
-            - mac-checkout
+            - mac-checkout-fast
+
+      - mas-debug:
+          requires:
+            - mac-checkout-fast

      - mas-debug-gn-check:
          requires:
-            - mac-checkout
+            - mac-checkout-fast
+
      - mas-testing-gn-check:
          requires:
-            - mac-checkout
+            - mac-checkout-fast

      - mas-testing-tests:
          requires:
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,6 +11,7 @@

 # Upgrades WG
 /patches/                               @electron/wg-upgrades
+DEPS                                    @electron/wg-upgrades

 # Docs & Tooling WG
 /default_app/ @electron/wg-docs-tools
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -300,10 +300,6 @@ source_set("manifests") {
    "//printing/buildflags",
    "//services/service_manager/public/cpp",
  ]
-
-  if (enable_basic_printing) {
-    deps += [ "//components/services/pdf_compositor/public/cpp:manifest" ]
-  }
 }

 npm_action("electron_version_args") {
@@ -582,9 +578,10 @@ source_set("electron_lib") {
  }

  if (enable_desktop_capturer) {
-    if (is_component_build && is_win) {
+    if (is_component_build && !is_linux) {
      # On windows the implementation relies on unexported
-      # DxgiDuplicatorController class.
+      # DxgiDuplicatorController class.  On macOS the implementation
+      # relies on unexported webrtc::GetWindowOwnerPid method.
      deps += [ "//third_party/webrtc/modules/desktop_capture" ]
    }
    sources += [
--- a/4
+++ b/4
@@ -10,9 +10,9 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '956a430350ccbeb16cf544f79c1990f1eae4d4fe',
+    '62327c655093c821aa0fcfc6db53f5fd943e08c7',
  'node_version':
-    'v12.8.0',
+    'v12.9.0',
  'nan_version':
    '2ee313aaca52e2b478965ac50eb5082520380d1b',

--- a/2
+++ b/2
@@ -1 +1 @@
-8.0.0-nightly.20190819
+8.0.0-nightly.20190825
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,7 +60,7 @@ build_script:
  - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
-        $env:GCLIENT_EXTRA_ARGS="--custom-var=checkout_boto=True --custom-var=checkout_requests=True"
+        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_boto=True --custom-var=checkout_requests=True"
      } else {
        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
      }
@@ -89,6 +89,10 @@ build_script:
  - appveyor PushArtifact out/Default/dist.zip
  - appveyor PushArtifact out/Default/chromedriver.zip
  - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
+  - 7z a node_headers.zip out\Default\gen\node_headers
+  - appveyor PushArtifact node_headers.zip
+  - appveyor PushArtifact out/Default/mksnapshot.zip
+  - appveyor PushArtifact out/Default/electron.lib
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
        # Needed for msdia140.dll on 64-bit windows
@@ -105,7 +109,7 @@ test_script:
  # Workaround for https://github.com/appveyor/ci/issues/2420
  - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
  - ps: >-
-      if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
+      if ((-Not (Test-Path Env:\TEST_WOA)) -And (-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
        $env:RUN_TESTS="true"
      }
  - ps: >-
@@ -133,4 +137,7 @@ deploy_script:
          Write-Output "Uploading Electron release distribution to github releases"
          & python script\release\uploaders\upload.py
        }
+      } elseif (Test-Path Env:\TEST_WOA) {
+        # node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
+        echo "Eventually run tests on WOA hardware at this step"
      }
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -0,0 +1,84 @@
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files to: src\electron'
+  inputs:
+    TargetFolder: src\electron
+
+- script: |
+    cd src\electron
+    npm install --verbose
+  displayName: 'NPM install'
+
+- powershell: |
+    $localArtifactPath = "$pwd\dist.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
+  displayName: 'Download and extract dist.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\ffmpeg.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
+  displayName: 'Download and extract ffmpeg.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\out\Default\mksnapshot.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/mksnapshot.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    cd src\out\Default
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y mksnapshot.zip
+  displayName: 'Download and unzip mksnapshot.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\node_headers.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    cd src
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
+  displayName: 'Download node headers for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\out\Default\electron.lib"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+  displayName: 'Download electron.lib for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    New-Item src\out\Default\gen\node_headers\Release -Type directory
+    Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
+  displayName: 'Setup node headers'
+
+- script: |
+    cd src
+    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
+  displayName: 'Run Electron tests'
+  env:
+    ELECTRON_OUT_DIR: Default
+    IGNORE_YARN_INSTALL_ERROR: 1
+
+- script: |
+    cd src
+    echo "Verifying non proprietary ffmpeg"
+    python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+  displayName: 'Verify ffmpeg'
+
+- script: |
+    cd src
+    echo "Verifying mksnapshot"
+    python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
+  displayName: 'Verify mksnapshot'
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -42,7 +42,7 @@ module.exports = ({
    resolve: {
      alias: {
        '@electron/internal': path.resolve(electronRoot, 'lib'),
-        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.js'),
+        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts'),
        // Force timers to resolve to our dependency that doens't use window.postMessage
        'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
      },
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -18,6 +18,7 @@ buildflag_header("buildflags") {
    "ENABLE_TTS=$enable_tts",
    "ENABLE_COLOR_CHOOSER=$enable_color_chooser",
    "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
+    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
    "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
  ]
 }
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -18,6 +18,8 @@ declare_args() {

  enable_color_chooser = true

+  enable_picture_in_picture = true
+
  # Provide a fake location provider for mocking
  # the geolocation responses. Disable it if you
  # need to test with chromium's location provider.
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -162,16 +162,18 @@ static_library("chrome") {
      "//chrome/browser/printing/printing_message_filter.cc",
      "//chrome/browser/printing/printing_message_filter.h",
    ]
+
    public_deps += [
      "//chrome/services/printing:lib",
      "//components/printing/browser",
      "//components/printing/renderer",
-      "//components/services/pdf_compositor/public/cpp:factory",
+      "//components/services/pdf_compositor",
+      "//components/services/pdf_compositor/public/cpp",
      "//components/services/pdf_compositor/public/mojom",
    ]
+
    deps += [
      "//components/printing/common",
-      "//components/services/pdf_compositor",
      "//printing",
    ]

@@ -184,4 +186,32 @@ static_library("chrome") {
      ]
    }
  }
+
+  if (enable_picture_in_picture) {
+    sources += [
+      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
+      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
+      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.cc",
+      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
+      "//chrome/browser/ui/views/overlay/close_image_button.cc",
+      "//chrome/browser/ui/views/overlay/close_image_button.h",
+      "//chrome/browser/ui/views/overlay/mute_image_button.cc",
+      "//chrome/browser/ui/views/overlay/mute_image_button.h",
+      "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
+      "//chrome/browser/ui/views/overlay/overlay_window_views.h",
+      "//chrome/browser/ui/views/overlay/playback_image_button.cc",
+      "//chrome/browser/ui/views/overlay/playback_image_button.h",
+      "//chrome/browser/ui/views/overlay/resize_handle_button.cc",
+      "//chrome/browser/ui/views/overlay/resize_handle_button.h",
+      "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
+      "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
+      "//chrome/browser/ui/views/overlay/track_image_button.cc",
+      "//chrome/browser/ui/views/overlay/track_image_button.h",
+    ]
+
+    deps += [
+      "//chrome/app/vector_icons",
+      "//components/vector_icons:vector_icons",
+    ]
+  }
 }
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -582,7 +582,7 @@ them.

 Sets or creates a directory your app's logs which can then be manipulated with `app.getPath()` or `app.setPath(pathName, newPath)`.

-Calling `app.setAppLogsPath()` without a `path` parameter will result in this directory being set to `/Library/Logs/YourAppName` on _macOS_, and inside the `userData` directory on _Linux_ and _Windows_.
+Calling `app.setAppLogsPath()` without a `path` parameter will result in this directory being set to `~/Library/Logs/YourAppName` on _macOS_, and inside the `userData` directory on _Linux_ and _Windows_.

 ### `app.getAppPath()`

@@ -614,6 +614,8 @@ Returns `String` - The current application directory.
 Returns `String` - A path to a special directory or file associated with `name`. On
 failure, an `Error` is thrown.

+If `app.getPath('logs')` is called without called `app.setAppLogsPath()` being called first, a default log directory will be created equivalent to calling `app.setAppLogsPath()` without a `path` parameter.
+
 ### `app.getFileIcon(path[, options])`

 * `path` String
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -516,14 +516,14 @@ Note that this is only emitted when the window is being resized manually. Resizi

 Emitted after the window has been resized.

-#### Event: 'will-move' _Windows_
+#### Event: 'will-move' _macOS_ _Windows_

 Returns:

 * `event` Event
 * `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to.

-Emitted before the window is moved. Calling `event.preventDefault()` will prevent the window from being moved.
+Emitted before the window is moved. On Windows, calling `event.preventDefault()` will prevent the window from being moved.

 Note that this is only emitted when the window is being resized manually. Resizing the window with `setBounds`/`setSize` will not emit this event.

--- a/docs/api/dock.md
+++ b/docs/api/dock.md
@@ -18,6 +18,8 @@ app.dock.bounce()
 * `type` String (optional) - Can be `critical` or `informational`. The default is
 `informational`

+Returns `Integer` - an ID representing the request.
+
 When `critical` is passed, the dock icon will bounce until either the
 application becomes active or the request is canceled.

@@ -25,7 +27,7 @@ When `informational` is passed, the dock icon will bounce for one second.
 However, the request remains active until either the application becomes active
 or the request is canceled.

-Returns `Integer` an ID representing the request.
+**Nota Bene:** This method can only be used while the app is not focused; when the app is focused it will return -1.

 #### `dock.cancelBounce(id)` _macOS_

--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -14,11 +14,11 @@ image file path as a `String`:
 const { BrowserWindow, Tray } = require('electron')

 const appIcon = new Tray('/Users/somebody/images/icon.png')
-let win = new BrowserWindow({ icon: '/Users/somebody/images/window.png' })
+const win = new BrowserWindow({ icon: '/Users/somebody/images/window.png' })
 console.log(appIcon, win)
 ```

-Or read the image from the clipboard which returns a `NativeImage`:
+Or read the image from the clipboard, which returns a `NativeImage`:

 ```javascript
 const { clipboard, Tray } = require('electron')
@@ -33,19 +33,19 @@ Currently `PNG` and `JPEG` image formats are supported. `PNG` is recommended
 because of its support for transparency and lossless compression.

 On Windows, you can also load `ICO` icons from file paths. For best visual
-quality it is recommended to include at least the following sizes in the:
+quality, it is recommended to include at least the following sizes in the:

 * Small icon
- * 16x16 (100% DPI scale)
- * 20x20 (125% DPI scale)
- * 24x24 (150% DPI scale)
- * 32x32 (200% DPI scale)
+  * 16x16 (100% DPI scale)
+  * 20x20 (125% DPI scale)
+  * 24x24 (150% DPI scale)
+  * 32x32 (200% DPI scale)
 * Large icon
- * 32x32 (100% DPI scale)
- * 40x40 (125% DPI scale)
- * 48x48 (150% DPI scale)
- * 64x64 (200% DPI scale)
-* 256x256
+  * 32x32 (100% DPI scale)
+  * 40x40 (125% DPI scale)
+  * 48x48 (150% DPI scale)
+  * 64x64 (200% DPI scale)
+  * 256x256

 Check the *Size requirements* section in [this article][icons].

@@ -56,7 +56,7 @@ Check the *Size requirements* section in [this article][icons].
 On platforms that have high-DPI support such as Apple Retina displays, you can
 append `@2x` after image's base filename to mark it as a high resolution image.

-For example if `icon.png` is a normal image that has standard resolution, then
+For example, if `icon.png` is a normal image that has standard resolution, then
 `icon@2x.png` will be treated as a high resolution image that has double DPI
 density.

@@ -73,11 +73,11 @@ images/

 ```javascript
 const { Tray } = require('electron')
-let appIcon = new Tray('/Users/somebody/images/icon.png')
+const appIcon = new Tray('/Users/somebody/images/icon.png')
 console.log(appIcon)
 ```

-Following suffixes for DPI are also supported:
+The following suffixes for DPI are also supported:

 * `@1x`
 * `@1.25x`
@@ -97,7 +97,7 @@ Template images consist of black and an alpha channel.
 Template images are not intended to be used as standalone images and are usually
 mixed with other content to create the desired final appearance.

-The most common case is to use template images for a menu bar icon so it can
+The most common case is to use template images for a menu bar icon, so it can
 adapt to both light and dark menu bars.

 **Note:** Template image is only supported on macOS.
@@ -132,7 +132,7 @@ a valid image.
 ```javascript
 const nativeImage = require('electron').nativeImage

-let image = nativeImage.createFromPath('/Users/somebody/images/icon.png')
+const image = nativeImage.createFromPath('/Users/somebody/images/icon.png')
 console.log(image)
 ```

@@ -180,7 +180,8 @@ Creates a new `NativeImage` instance from the NSImage that maps to the
 given image name. See [`System Icons`](https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/system-icons/)
 for a list of possible values.

-The `hslShift` is applied to the image with the following rules
+The `hslShift` is applied to the image with the following rules:
+
 * `hsl_shift[0]` (hue): The absolute hue value for the image - 0 and 1 map
     to 0 and 360 on the hue color wheel (red).
 * `hsl_shift[1]` (saturation): A saturation shift for the image, with the
@@ -248,9 +249,9 @@ Returns `String` - The data URL of the image.

 Returns `Buffer` - A [Buffer][buffer] that contains the image's raw bitmap pixel data.

-The difference between `getBitmap()` and `toBitmap()` is, `getBitmap()` does not
+The difference between `getBitmap()` and `toBitmap()` is that `getBitmap()` does not
 copy the bitmap data, so you have to use the returned Buffer immediately in
-current event loop tick, otherwise the data might be changed or destroyed.
+current event loop tick; otherwise the data might be changed or destroyed.

 #### `image.getNativeHandle()` _macOS_

@@ -295,7 +296,7 @@ Returns `NativeImage` - The cropped image.
  * `width` Integer (optional) - Defaults to the image's width.
  * `height` Integer (optional) - Defaults to the image's height.
  * `quality` String (optional) - The desired quality of the resize image.
-    Possible values are `good`, `better` or `best`. The default is `best`.
+    Possible values are `good`, `better`, or `best`. The default is `best`.
    These values express a desired quality/speed tradeoff. They are translated
    into an algorithm-specific method that depends on the capabilities
    (CPU, GPU) of the underlying platform. It is possible for all three methods
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -27,18 +27,8 @@ see [SECURITY.md](https://github.com/electron/electron/tree/master/SECURITY.md)

 ## Chromium Security Issues and Upgrades

-While Electron strives to support new versions of Chromium as soon as possible,
-developers should be aware that upgrading is a serious undertaking - involving
-hand-editing dozens or even hundreds of files. Given the resources and
-contributions available today, Electron will often not be on the very latest
-version of Chromium, lagging behind by several weeks or a few months.
-
-We feel that our current system of updating the Chromium component strikes an
-appropriate balance between the resources we have available and the needs of
-the majority of applications built on top of the framework. We definitely are
-interested in hearing more about specific use cases from the people that build
-things on top of Electron. Pull requests and contributions supporting this
-effort are always very welcome.
+Electron keeps up to date with alternating Chromium releases. For more information,
+see the [Electron Release Cadence blog post](https://electronjs.org/blog/12-week-cadence).

 ## Security Is Everyone's Responsibility

--- a/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -18,4 +18,55 @@
  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
  </message>
+
+  <!-- Picture-in-Picture -->
+  <if expr="is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in Picture
+    </message>
+  </if>
+  <if expr="not is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in picture
+    </message>
+  </if>
+  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
+    Pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
+    Play
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
+    Play from the beginning
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Back to video player
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
+    Mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
+    Unmute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Skip Ad
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Close
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
+    Resize
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
+    Toggle video to play or pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
+    Toggle mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
+    Next track
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
+    Previous track
+  </message>
 </grit-part>
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -130,13 +130,14 @@ auto_filenames = {
    "lib/browser/api/module-keys.js",
    "lib/common/api/clipboard.js",
    "lib/common/api/deprecate.ts",
-    "lib/common/api/module-list.js",
+    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.js",
    "lib/common/api/native-theme.ts",
    "lib/common/api/shell.js",
    "lib/common/buffer-utils.ts",
    "lib/common/clipboard-utils.ts",
    "lib/common/crash-reporter.js",
+    "lib/common/define-properties.ts",
    "lib/common/electron-binding-setup.ts",
    "lib/common/error-utils.ts",
    "lib/common/is-promise.ts",
@@ -164,8 +165,8 @@ auto_filenames = {
    "lib/renderer/web-view/web-view-element.ts",
    "lib/renderer/web-view/web-view-impl.ts",
    "lib/renderer/web-view/web-view-init.ts",
-    "lib/sandboxed_renderer/api/exports/electron.js",
-    "lib/sandboxed_renderer/api/module-list.js",
+    "lib/sandboxed_renderer/api/exports/electron.ts",
+    "lib/sandboxed_renderer/api/module-list.ts",
    "lib/sandboxed_renderer/init.js",
    "package.json",
    "tsconfig.electron.json",
@@ -214,7 +215,7 @@ auto_filenames = {
    "lib/browser/api/content-tracing.js",
    "lib/browser/api/crash-reporter.js",
    "lib/browser/api/dialog.js",
-    "lib/browser/api/exports/electron.js",
+    "lib/browser/api/exports/electron.ts",
    "lib/browser/api/global-shortcut.js",
    "lib/browser/api/in-app-purchase.js",
    "lib/browser/api/ipc-main.ts",
@@ -222,7 +223,7 @@ auto_filenames = {
    "lib/browser/api/menu-item.js",
    "lib/browser/api/menu-utils.js",
    "lib/browser/api/menu.js",
-    "lib/browser/api/module-list.js",
+    "lib/browser/api/module-list.ts",
    "lib/browser/api/net-log.js",
    "lib/browser/api/net.js",
    "lib/browser/api/notification.js",
@@ -253,6 +254,7 @@ auto_filenames = {
    "lib/browser/guest-view-manager.js",
    "lib/browser/guest-window-manager.js",
    "lib/browser/init.ts",
+    "lib/browser/ipc-main-impl.ts",
    "lib/browser/ipc-main-internal-utils.ts",
    "lib/browser/ipc-main-internal.ts",
    "lib/browser/navigation-controller.js",
@@ -261,14 +263,14 @@ auto_filenames = {
    "lib/browser/utils.ts",
    "lib/common/api/clipboard.js",
    "lib/common/api/deprecate.ts",
-    "lib/common/api/exports/electron.js",
-    "lib/common/api/module-list.js",
+    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.js",
    "lib/common/api/native-theme.ts",
    "lib/common/api/shell.js",
    "lib/common/buffer-utils.ts",
    "lib/common/clipboard-utils.ts",
    "lib/common/crash-reporter.js",
+    "lib/common/define-properties.ts",
    "lib/common/electron-binding-setup.ts",
    "lib/common/error-utils.ts",
    "lib/common/init.ts",
@@ -287,14 +289,14 @@ auto_filenames = {
    "lib/browser/api/module-keys.js",
    "lib/common/api/clipboard.js",
    "lib/common/api/deprecate.ts",
-    "lib/common/api/exports/electron.js",
-    "lib/common/api/module-list.js",
+    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.js",
    "lib/common/api/native-theme.ts",
    "lib/common/api/shell.js",
    "lib/common/buffer-utils.ts",
    "lib/common/clipboard-utils.ts",
    "lib/common/crash-reporter.js",
+    "lib/common/define-properties.ts",
    "lib/common/electron-binding-setup.ts",
    "lib/common/error-utils.ts",
    "lib/common/init.ts",
@@ -303,9 +305,9 @@ auto_filenames = {
    "lib/common/web-view-methods.ts",
    "lib/renderer/api/crash-reporter.js",
    "lib/renderer/api/desktop-capturer.ts",
-    "lib/renderer/api/exports/electron.js",
+    "lib/renderer/api/exports/electron.ts",
    "lib/renderer/api/ipc-renderer.ts",
-    "lib/renderer/api/module-list.js",
+    "lib/renderer/api/module-list.ts",
    "lib/renderer/api/remote.js",
    "lib/renderer/api/web-frame.ts",
    "lib/renderer/callbacks-registry.ts",
@@ -338,14 +340,14 @@ auto_filenames = {
    "lib/browser/api/module-keys.js",
    "lib/common/api/clipboard.js",
    "lib/common/api/deprecate.ts",
-    "lib/common/api/exports/electron.js",
-    "lib/common/api/module-list.js",
+    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.js",
    "lib/common/api/native-theme.ts",
    "lib/common/api/shell.js",
    "lib/common/buffer-utils.ts",
    "lib/common/clipboard-utils.ts",
    "lib/common/crash-reporter.js",
+    "lib/common/define-properties.ts",
    "lib/common/electron-binding-setup.ts",
    "lib/common/error-utils.ts",
    "lib/common/init.ts",
@@ -353,9 +355,9 @@ auto_filenames = {
    "lib/common/reset-search-paths.ts",
    "lib/renderer/api/crash-reporter.js",
    "lib/renderer/api/desktop-capturer.ts",
-    "lib/renderer/api/exports/electron.js",
+    "lib/renderer/api/exports/electron.ts",
    "lib/renderer/api/ipc-renderer.ts",
-    "lib/renderer/api/module-list.js",
+    "lib/renderer/api/module-list.ts",
    "lib/renderer/api/remote.js",
    "lib/renderer/api/web-frame.ts",
    "lib/renderer/callbacks-registry.ts",
--- a/filenames.gni
+++ b/filenames.gni
@@ -125,6 +125,10 @@ filenames = {
    "shell/browser/auto_updater.cc",
    "shell/browser/auto_updater.h",
    "shell/browser/auto_updater_mac.mm",
+    "shell/browser/atom_autofill_driver_factory.cc",
+    "shell/browser/atom_autofill_driver_factory.h",
+    "shell/browser/atom_autofill_driver.cc",
+    "shell/browser/atom_autofill_driver.h",
    "shell/browser/atom_blob_reader.cc",
    "shell/browser/atom_blob_reader.h",
    "shell/browser/atom_browser_client.cc",
@@ -480,7 +484,6 @@ filenames = {
    "shell/common/gin_converters/net_converter.cc",
    "shell/common/gin_converters/net_converter.h",
    "shell/common/gin_converters/std_converter.h",
-    "shell/common/gin_converters/string16_converter.h",
    "shell/common/gin_converters/value_converter_gin_adapter.h",
    "shell/common/gin_util.h",
    "shell/common/heap_snapshot.cc",
@@ -490,6 +493,8 @@ filenames = {
    "shell/common/keyboard_util.h",
    "shell/common/deprecate_util.cc",
    "shell/common/deprecate_util.h",
+    "shell/common/error_util.cc",
+    "shell/common/error_util.h",
    "shell/common/mouse_util.cc",
    "shell/common/mouse_util.h",
    "shell/common/mac/main_application_bundle.h",
--- a/lib/browser/api/exports/electron.js
+++ b/lib/browser/api/exports/electron.js
@@ -1,15 +0,0 @@
-'use strict'
-
-const common = require('@electron/internal/common/api/exports/electron')
-// since browser module list is also used in renderer, keep it separate.
-const moduleList = require('@electron/internal/browser/api/module-list')
-
-// Import common modules.
-common.defineProperties(exports)
-
-for (const module of moduleList) {
-  Object.defineProperty(exports, module.name, {
-    enumerable: !module.private,
-    get: common.handleESModule(module.loader)
-  })
-}
--- a/lib/browser/api/exports/electron.ts
+++ b/lib/browser/api/exports/electron.ts
@@ -0,0 +1,6 @@
+import { defineProperties } from '@electron/internal/common/define-properties'
+import { commonModuleList } from '@electron/internal/common/api/module-list'
+import { browserModuleList } from '@electron/internal/browser/api/module-list'
+
+defineProperties(exports, commonModuleList)
+defineProperties(exports, browserModuleList)
--- a/lib/browser/api/ipc-main.ts
+++ b/lib/browser/api/ipc-main.ts
@@ -1,38 +1,6 @@
-import { EventEmitter } from 'events'
-import { IpcMainInvokeEvent } from 'electron'
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl'

-class IpcMain extends EventEmitter {
-  private _invokeHandlers: Map<string, (e: IpcMainInvokeEvent, ...args: any[]) => void> = new Map();
-
-  handle: Electron.IpcMain['handle'] = (method, fn) => {
-    if (this._invokeHandlers.has(method)) {
-      throw new Error(`Attempted to register a second handler for '${method}'`)
-    }
-    if (typeof fn !== 'function') {
-      throw new Error(`Expected handler to be a function, but found type '${typeof fn}'`)
-    }
-    this._invokeHandlers.set(method, async (e, ...args) => {
-      try {
-        (e as any)._reply(await Promise.resolve(fn(e, ...args)))
-      } catch (err) {
-        (e as any)._throw(err)
-      }
-    })
-  }
-
-  handleOnce: Electron.IpcMain['handleOnce'] = (method, fn) => {
-    this.handle(method, (e, ...args) => {
-      this.removeHandler(method)
-      return fn(e, ...args)
-    })
-  }
-
-  removeHandler (method: string) {
-    this._invokeHandlers.delete(method)
-  }
-}
-
-const ipcMain = new IpcMain()
+const ipcMain = new IpcMainImpl()

 // Do not throw exception when channel name is "error".
 ipcMain.on('error', () => {})
--- a/lib/browser/api/module-list.ts
+++ b/lib/browser/api/module-list.ts
@@ -1,11 +1,9 @@
-'use strict'
-
 // TODO: Updating this file also required updating the module-keys file

 const features = process.electronBinding('features')

 // Browser side modules, please sort alphabetically.
-module.exports = [
+export const browserModuleList: ElectronInternal.ModuleEntry[] = [
  { name: 'app', loader: () => require('./app') },
  { name: 'autoUpdater', loader: () => require('./auto-updater') },
  { name: 'BrowserView', loader: () => require('./browser-view') },
@@ -36,7 +34,7 @@ module.exports = [
 ]

 if (features.isViewApiEnabled()) {
-  module.exports.push(
+  browserModuleList.push(
    { name: 'BoxLayout', loader: () => require('./views/box-layout') },
    { name: 'Button', loader: () => require('./views/button') },
    { name: 'LabelButton', loader: () => require('./views/label-button') },
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -327,14 +327,15 @@ WebContents.prototype._init = function () {
    }
  })

-  this.on('-ipc-invoke', function (event, channel, args) {
+  this.on('-ipc-invoke', function (event, internal, channel, args) {
    event._reply = (result) => event.sendReply({ result })
    event._throw = (error) => {
      console.error(`Error occurred in handler for '${channel}':`, error)
      event.sendReply({ error: error.toString() })
    }
-    if (ipcMain._invokeHandlers.has(channel)) {
-      ipcMain._invokeHandlers.get(channel)(event, ...args)
+    const target = internal ? ipcMainInternal : ipcMain
+    if (target._invokeHandlers.has(channel)) {
+      target._invokeHandlers.get(channel)(event, ...args)
    } else {
      event._throw(`No handler registered for '${channel}'`)
    }
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -6,6 +6,7 @@ if (process.electronBinding('features').isExtensionsEnabled()) {

 const { app, webContents, BrowserWindow } = require('electron')
 const { getAllWebContents } = process.electronBinding('web_contents')
+const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
 const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')

 const { Buffer } = require('buffer')
@@ -160,7 +161,7 @@ const hookWebContentsEvents = function (webContents) {
 // Handle the chrome.* API messages.
 let nextId = 0

-ipcMainUtils.handle('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo) {
+ipcMainUtils.handleSync('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo) {
  if (isBackgroundPage(event.sender)) {
    throw new Error('chrome.runtime.connect is not supported in background page')
  }
@@ -182,7 +183,7 @@ ipcMainUtils.handle('CHROME_RUNTIME_CONNECT', function (event, extensionId, conn
  return { tabId, portId }
 })

-ipcMainUtils.handle('CHROME_EXTENSION_MANIFEST', function (event, extensionId) {
+ipcMainUtils.handleSync('CHROME_EXTENSION_MANIFEST', function (event, extensionId) {
  const manifest = manifestMap[extensionId]
  if (!manifest) {
    throw new Error(`Invalid extensionId: ${extensionId}`)
@@ -190,7 +191,7 @@ ipcMainUtils.handle('CHROME_EXTENSION_MANIFEST', function (event, extensionId) {
  return manifest
 })

-ipcMainUtils.handle('CHROME_RUNTIME_SEND_MESSAGE', async function (event, extensionId, message) {
+ipcMainInternal.handle('CHROME_RUNTIME_SEND_MESSAGE', async function (event, extensionId, message) {
  if (isBackgroundPage(event.sender)) {
    throw new Error('chrome.runtime.sendMessage is not supported in background page')
  }
@@ -203,7 +204,7 @@ ipcMainUtils.handle('CHROME_RUNTIME_SEND_MESSAGE', async function (event, extens
  return ipcMainUtils.invokeInWebContents(page.webContents, true, `CHROME_RUNTIME_ONMESSAGE_${extensionId}`, event.sender.id, message)
 })

-ipcMainUtils.handle('CHROME_TABS_SEND_MESSAGE', async function (event, tabId, extensionId, message) {
+ipcMainInternal.handle('CHROME_TABS_SEND_MESSAGE', async function (event, tabId, extensionId, message) {
  const contents = webContents.fromId(tabId)
  if (!contents) {
    throw new Error(`Sending message to unknown tab ${tabId}`)
@@ -237,7 +238,7 @@ const getMessagesPath = (extensionId) => {
  }
 }

-ipcMainUtils.handle('CHROME_GET_MESSAGES', async function (event, extensionId) {
+ipcMainUtils.handleSync('CHROME_GET_MESSAGES', async function (event, extensionId) {
  const messagesPath = getMessagesPath(extensionId)
  return fs.promises.readFile(messagesPath)
 })
@@ -256,7 +257,7 @@ const getChromeStoragePath = (storageType, extensionId) => {
  return path.join(app.getPath('userData'), `/Chrome Storage/${extensionId}-${storageType}.json`)
 }

-ipcMainUtils.handle('CHROME_STORAGE_READ', async function (event, storageType, extensionId) {
+ipcMainInternal.handle('CHROME_STORAGE_READ', async function (event, storageType, extensionId) {
  const filePath = getChromeStoragePath(storageType, extensionId)

  try {
@@ -270,7 +271,7 @@ ipcMainUtils.handle('CHROME_STORAGE_READ', async function (event, storageType, e
  }
 })

-ipcMainUtils.handle('CHROME_STORAGE_WRITE', async function (event, storageType, extensionId, data) {
+ipcMainInternal.handle('CHROME_STORAGE_WRITE', async function (event, storageType, extensionId, data) {
  const filePath = getChromeStoragePath(storageType, extensionId)

  try {
@@ -295,7 +296,7 @@ const assertChromeExtension = function (contents, api) {
  }
 }

-ipcMainUtils.handle('CHROME_TABS_EXECUTE_SCRIPT', async function (event, tabId, extensionId, details) {
+ipcMainInternal.handle('CHROME_TABS_EXECUTE_SCRIPT', async function (event, tabId, extensionId, details) {
  assertChromeExtension(event.sender, 'chrome.tabs.executeScript()')

  const contents = webContents.fromId(tabId)
--- a/lib/browser/devtools.ts
+++ b/lib/browser/devtools.ts
@@ -2,7 +2,8 @@ import { dialog, Menu } from 'electron'
 import * as fs from 'fs'
 import * as url from 'url'

-const ipcMainUtils = require('@electron/internal/browser/ipc-main-internal-utils')
+import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal'
+import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils'

 const convertToMenuTemplate = function (items: ContextMenuItem[], handler: (id: number) => void) {
  return items.map(function (item) {
@@ -59,7 +60,7 @@ const assertChromeDevTools = function (contents: Electron.WebContents, api: stri
  }
 }

-ipcMainUtils.handle('ELECTRON_INSPECTOR_CONTEXT_MENU', function (event: Electron.IpcMainEvent, items: ContextMenuItem[], isEditMenu: boolean) {
+ipcMainInternal.handle('ELECTRON_INSPECTOR_CONTEXT_MENU', function (event: Electron.IpcMainInvokeEvent, items: ContextMenuItem[], isEditMenu: boolean) {
  return new Promise(resolve => {
    assertChromeDevTools(event.sender, 'window.InspectorFrontendHost.showContextMenuAtPoint()')

@@ -71,7 +72,7 @@ ipcMainUtils.handle('ELECTRON_INSPECTOR_CONTEXT_MENU', function (event: Electron
  })
 })

-ipcMainUtils.handle('ELECTRON_INSPECTOR_SELECT_FILE', async function (event: Electron.IpcMainEvent) {
+ipcMainInternal.handle('ELECTRON_INSPECTOR_SELECT_FILE', async function (event: Electron.IpcMainInvokeEvent) {
  assertChromeDevTools(event.sender, 'window.UI.createFileSelectorElement()')

  const result = await dialog.showOpenDialog({})
@@ -83,7 +84,7 @@ ipcMainUtils.handle('ELECTRON_INSPECTOR_SELECT_FILE', async function (event: Ele
  return [path, data]
 })

-ipcMainUtils.handle('ELECTRON_INSPECTOR_CONFIRM', async function (event: Electron.IpcMainEvent, message: string = '', title: string = '') {
+ipcMainUtils.handleSync('ELECTRON_INSPECTOR_CONFIRM', async function (event: Electron.IpcMainInvokeEvent, message: string = '', title: string = '') {
  assertChromeDevTools(event.sender, 'window.confirm()')

  const options = {
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -312,21 +312,33 @@ const isWebViewTagEnabled = function (contents) {
  return isWebViewTagEnabledCache.get(contents)
 }

-const handleMessage = function (channel, handler) {
-  ipcMainUtils.handle(channel, (event, ...args) => {
+const makeSafeHandler = function (channel, handler) {
+  return (event, ...args) => {
    if (isWebViewTagEnabled(event.sender)) {
      return handler(event, ...args)
    } else {
      console.error(`<webview> IPC message ${channel} sent by WebContents with <webview> disabled (${event.sender.id})`)
      throw new Error('<webview> disabled')
    }
-  })
+  }
+}
+
+const handleMessage = function (channel, handler) {
+  ipcMainInternal.handle(channel, makeSafeHandler(channel, handler))
+}
+
+const handleMessageSync = function (channel, handler) {
+  ipcMainUtils.handleSync(channel, makeSafeHandler(channel, handler))
 }

 handleMessage('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params) {
  return createGuest(event.sender, params)
 })

+handleMessageSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params) {
+  return createGuest(event.sender, params)
+})
+
 handleMessage('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, embedderFrameId, elementInstanceId, guestInstanceId, params) {
  try {
    attachGuest(event, embedderFrameId, elementInstanceId, guestInstanceId, params)
@@ -345,11 +357,18 @@ ipcMainInternal.on('ELECTRON_GUEST_VIEW_MANAGER_FOCUS_CHANGE', function (event,
  }
 })

-const allMethods = new Set([ ...syncMethods, ...asyncMethods ])
-
 handleMessage('ELECTRON_GUEST_VIEW_MANAGER_CALL', function (event, guestInstanceId, method, args) {
  const guest = getGuestForWebContents(guestInstanceId, event.sender)
-  if (!allMethods.has(method)) {
+  if (!asyncMethods.has(method)) {
+    throw new Error(`Invalid method: ${method}`)
+  }
+
+  return guest[method](...args)
+})
+
+handleMessageSync('ELECTRON_GUEST_VIEW_MANAGER_CALL', function (event, guestInstanceId, method, args) {
+  const guest = getGuestForWebContents(guestInstanceId, event.sender)
+  if (!syncMethods.has(method)) {
    throw new Error(`Invalid method: ${method}`)
  }

--- a/lib/browser/guest-window-manager.js
+++ b/lib/browser/guest-window-manager.js
@@ -271,15 +271,30 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_INTERNAL_WINDOW_OPEN', functio
  }
 })

-const handleMessage = function (channel, handler) {
-  ipcMainUtils.handle(channel, (event, guestId, ...args) => {
+const makeSafeHandler = function (handler) {
+  return (event, guestId, ...args) => {
    const guestContents = webContents.fromId(guestId)
    if (!guestContents) {
      throw new Error(`Invalid guestId: ${guestId}`)
    }

    return handler(event, guestContents, ...args)
-  })
+  }
+}
+
+const handleMessage = function (channel, handler) {
+  ipcMainInternal.handle(channel, makeSafeHandler(handler))
+}
+
+const handleMessageSync = function (channel, handler) {
+  ipcMainUtils.handleSync(channel, makeSafeHandler(handler))
+}
+
+const assertCanAccessWindow = function (contents, guestContents) {
+  if (!canAccessWindow(contents, guestContents)) {
+    console.error(`Blocked ${contents.getURL()} from accessing guestId: ${guestContents.id}`)
+    throw new Error(`Access denied to guestId: ${guestContents.id}`)
+  }
 }

 const windowMethods = new Set([
@@ -289,10 +304,7 @@ const windowMethods = new Set([
 ])

 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', (event, guestContents, method, ...args) => {
-  if (!canAccessWindow(event.sender, guestContents)) {
-    console.error(`Blocked ${event.sender.getURL()} from accessing guestId: ${guestContents.id}`)
-    throw new Error(`Access denied to guestId: ${guestContents.id}`)
-  }
+  assertCanAccessWindow(event.sender, guestContents)

  if (!windowMethods.has(method)) {
    console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
@@ -316,20 +328,31 @@ handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', (event, guestC
  }
 })

-const webContentsMethods = new Set([
-  'getURL',
+const webContentsMethodsAsync = new Set([
  'loadURL',
  'executeJavaScript',
  'print'
 ])

 handleMessage('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
-  if (!canAccessWindow(event.sender, guestContents)) {
-    console.error(`Blocked ${event.sender.getURL()} from accessing guestId: ${guestContents.id}`)
-    throw new Error(`Access denied to guestId: ${guestContents.id}`)
-  }
+  assertCanAccessWindow(event.sender, guestContents)

-  if (!webContentsMethods.has(method)) {
+  if (!webContentsMethodsAsync.has(method)) {
+    console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
+    throw new Error(`Invalid method: ${method}`)
+  }
+
+  return guestContents[method](...args)
+})
+
+const webContentsMethodsSync = new Set([
+  'getURL'
+])
+
+handleMessageSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestContents, method, ...args) => {
+  assertCanAccessWindow(event.sender, guestContents)
+
+  if (!webContentsMethodsSync.has(method)) {
    console.error(`Blocked ${event.sender.getURL()} from calling method: ${method}`)
    throw new Error(`Invalid method: ${method}`)
  }
--- a/lib/browser/ipc-main-impl.ts
+++ b/lib/browser/ipc-main-impl.ts
@@ -0,0 +1,33 @@
+import { EventEmitter } from 'events'
+import { IpcMainInvokeEvent } from 'electron'
+
+export class IpcMainImpl extends EventEmitter {
+  private _invokeHandlers: Map<string, (e: IpcMainInvokeEvent, ...args: any[]) => void> = new Map();
+
+  handle: Electron.IpcMain['handle'] = (method, fn) => {
+    if (this._invokeHandlers.has(method)) {
+      throw new Error(`Attempted to register a second handler for '${method}'`)
+    }
+    if (typeof fn !== 'function') {
+      throw new Error(`Expected handler to be a function, but found type '${typeof fn}'`)
+    }
+    this._invokeHandlers.set(method, async (e, ...args) => {
+      try {
+        (e as any)._reply(await Promise.resolve(fn(e, ...args)))
+      } catch (err) {
+        (e as any)._throw(err)
+      }
+    })
+  }
+
+  handleOnce: Electron.IpcMain['handleOnce'] = (method, fn) => {
+    this.handle(method, (e, ...args) => {
+      this.removeHandler(method)
+      return fn(e, ...args)
+    })
+  }
+
+  removeHandler (method: string) {
+    this._invokeHandlers.delete(method)
+  }
+}
--- a/lib/browser/ipc-main-internal-utils.ts
+++ b/lib/browser/ipc-main-internal-utils.ts
@@ -1,26 +1,15 @@
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal'
 import * as errorUtils from '@electron/internal/common/error-utils'

-type IPCHandler = (event: ElectronInternal.IpcMainInternalEvent, ...args: any[]) => any
+type IPCHandler = (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any

-const callHandler = async function (handler: IPCHandler, event: ElectronInternal.IpcMainInternalEvent, args: any[], reply: (args: any[]) => void) {
-  try {
-    const result = await handler(event, ...args)
-    reply([null, result])
-  } catch (error) {
-    reply([errorUtils.serialize(error)])
-  }
-}
-
-export const handle = function <T extends IPCHandler> (channel: string, handler: T) {
-  ipcMainInternal.on(channel, (event, requestId, ...args) => {
-    callHandler(handler, event, args, responseArgs => {
-      if (requestId) {
-        event._replyInternal(`${channel}_RESPONSE_${requestId}`, ...responseArgs)
-      } else {
-        event.returnValue = responseArgs
-      }
-    })
+export const handleSync = function <T extends IPCHandler> (channel: string, handler: T) {
+  ipcMainInternal.on(channel, async (event, ...args) => {
+    try {
+      event.returnValue = [null, await handler(event, ...args)]
+    } catch (error) {
+      event.returnValue = [errorUtils.serialize(error)]
+    }
  })
 }

--- a/lib/browser/ipc-main-internal.ts
+++ b/lib/browser/ipc-main-internal.ts
@@ -1,8 +1,6 @@
-import { EventEmitter } from 'events'
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl'

-const emitter = new EventEmitter()
+export const ipcMainInternal = new IpcMainImpl() as ElectronInternal.IpcMainInternal

 // Do not throw exception when channel name is "error".
-emitter.on('error', () => {})
-
-export const ipcMainInternal = emitter as ElectronInternal.IpcMainInternal
+ipcMainInternal.on('error', () => {})
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -471,11 +471,11 @@ ipcMainInternal.on('ELECTRON_BROWSER_WINDOW_CLOSE', function (event) {
  event.returnValue = null
 })

-ipcMainUtils.handle('ELECTRON_CRASH_REPORTER_INIT', function (event, options) {
+ipcMainUtils.handleSync('ELECTRON_CRASH_REPORTER_INIT', function (event, options) {
  return crashReporterInit(options)
 })

-ipcMainUtils.handle('ELECTRON_BROWSER_GET_LAST_WEB_PREFERENCES', function (event) {
+ipcMainInternal.handle('ELECTRON_BROWSER_GET_LAST_WEB_PREFERENCES', function (event) {
  return event.sender.getLastWebPreferences()
 })

@@ -491,7 +491,7 @@ const allowedClipboardMethods = (() => {
  }
 })()

-ipcMainUtils.handle('ELECTRON_BROWSER_CLIPBOARD', function (event, method, ...args) {
+ipcMainUtils.handleSync('ELECTRON_BROWSER_CLIPBOARD', function (event, method, ...args) {
  if (!allowedClipboardMethods.has(method)) {
    throw new Error(`Invalid method: ${method}`)
  }
@@ -502,7 +502,7 @@ ipcMainUtils.handle('ELECTRON_BROWSER_CLIPBOARD', function (event, method, ...ar
 if (features.isDesktopCapturerEnabled()) {
  const desktopCapturer = require('@electron/internal/browser/desktop-capturer')

-  ipcMainUtils.handle('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function (event, ...args) {
+  ipcMainInternal.handle('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function (event, ...args) {
    const customEvent = emitCustomEvent(event.sender, 'desktop-capturer-get-sources')

    if (customEvent.defaultPrevented) {
@@ -526,13 +526,13 @@ const getPreloadScript = async function (preloadPath) {
 }

 if (process.electronBinding('features').isExtensionsEnabled()) {
-  ipcMainUtils.handle('ELECTRON_GET_CONTENT_SCRIPTS', () => [])
+  ipcMainUtils.handleSync('ELECTRON_GET_CONTENT_SCRIPTS', () => [])
 } else {
  const { getContentScripts } = require('@electron/internal/browser/chrome-extension')
-  ipcMainUtils.handle('ELECTRON_GET_CONTENT_SCRIPTS', () => getContentScripts())
+  ipcMainUtils.handleSync('ELECTRON_GET_CONTENT_SCRIPTS', () => getContentScripts())
 }

-ipcMainUtils.handle('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event) {
+ipcMainUtils.handleSync('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event) {
  const preloadPaths = event.sender._getPreloadPaths()

  let contentScripts = []
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -1,37 +0,0 @@
-'use strict'
-
-const moduleList = require('@electron/internal/common/api/module-list')
-
-exports.handleESModule = (loader) => () => {
-  const value = loader()
-  if (value.__esModule && value.default) return value.default
-  return value
-}
-
-exports.memoizedGetter = (getter) => {
-  /*
-   * It's ok to leak this value as it would be leaked by the global
-   * node module cache anyway at `Module._cache`.  This memoization
-   * is dramatically faster than relying on nodes module cache however
-   */
-  let memoizedValue = null
-
-  return () => {
-    if (memoizedValue === null) {
-      memoizedValue = getter()
-    }
-    return memoizedValue
-  }
-}
-
-// Attaches properties to |targetExports|.
-exports.defineProperties = function (targetExports) {
-  const descriptors = {}
-  for (const module of moduleList) {
-    descriptors[module.name] = {
-      enumerable: !module.private,
-      get: exports.handleESModule(module.loader)
-    }
-  }
-  return Object.defineProperties(targetExports, descriptors)
-}
--- a/lib/common/api/module-list.ts
+++ b/lib/common/api/module-list.ts
@@ -1,7 +1,5 @@
-'use strict'
-
 // Common modules, please sort alphabetically
-module.exports = [
+export const commonModuleList: ElectronInternal.ModuleEntry[] = [
  { name: 'clipboard', loader: () => require('./clipboard') },
  { name: 'nativeImage', loader: () => require('./native-image') },
  { name: 'nativeTheme', loader: () => require('./native-theme') },
--- a/lib/common/define-properties.ts
+++ b/lib/common/define-properties.ts
@@ -0,0 +1,17 @@
+const handleESModule = (loader: ElectronInternal.ModuleLoader) => () => {
+  const value = loader()
+  if (value.__esModule && value.default) return value.default
+  return value
+}
+
+// Attaches properties to |targetExports|.
+export function defineProperties (targetExports: Object, moduleList: ElectronInternal.ModuleEntry[]) {
+  const descriptors: PropertyDescriptorMap = {}
+  for (const module of moduleList) {
+    descriptors[module.name] = {
+      enumerable: !module.private,
+      get: handleESModule(module.loader)
+    }
+  }
+  return Object.defineProperties(targetExports, descriptors)
+}
--- a/lib/renderer/api/desktop-capturer.ts
+++ b/lib/renderer/api/desktop-capturer.ts
@@ -1,5 +1,5 @@
 import { nativeImage } from 'electron'
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'

 // |options.types| can't be empty and must be an array
 function isValid (options: Electron.SourcesOptions) {
@@ -16,7 +16,7 @@ export async function getSources (options: Electron.SourcesOptions) {
  const { thumbnailSize = { width: 150, height: 150 } } = options
  const { fetchWindowIcons = false } = options

-  const sources = await ipcRendererUtils.invoke<ElectronInternal.GetSourcesResult[]>('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', {
+  const sources = await ipcRendererInternal.invoke<ElectronInternal.GetSourcesResult[]>('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', {
    captureWindow,
    captureScreen,
    thumbnailSize,
--- a/lib/renderer/api/exports/electron.js
+++ b/lib/renderer/api/exports/electron.js
@@ -1,14 +0,0 @@
-'use strict'
-
-const common = require('@electron/internal/common/api/exports/electron')
-const moduleList = require('@electron/internal/renderer/api/module-list')
-
-// Import common modules.
-common.defineProperties(exports)
-
-for (const module of moduleList) {
-  Object.defineProperty(exports, module.name, {
-    enumerable: !module.private,
-    get: common.handleESModule(module.loader)
-  })
-}
--- a/lib/renderer/api/exports/electron.ts
+++ b/lib/renderer/api/exports/electron.ts
@@ -0,0 +1,6 @@
+import { defineProperties } from '@electron/internal/common/define-properties'
+import { commonModuleList } from '@electron/internal/common/api/module-list'
+import { rendererModuleList } from '@electron/internal/renderer/api/module-list'
+
+defineProperties(exports, commonModuleList)
+defineProperties(exports, rendererModuleList)
--- a/lib/renderer/api/ipc-renderer.ts
+++ b/lib/renderer/api/ipc-renderer.ts
@@ -21,11 +21,12 @@ ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
  return ipc.sendTo(internal, false, webContentsId, channel, args)
 }

-ipcRenderer.invoke = function (channel, ...args) {
-  return ipc.invoke(channel, args).then(({ error, result }) => {
-    if (error) { throw new Error(`Error invoking remote method '${channel}': ${error}`) }
-    return result
-  })
+ipcRenderer.invoke = async function (channel, ...args) {
+  const { error, result } = await ipc.invoke(internal, channel, args)
+  if (error) {
+    throw new Error(`Error invoking remote method '${channel}': ${error}`)
+  }
+  return result
 }

 export default ipcRenderer
--- a/lib/renderer/api/module-list.ts
+++ b/lib/renderer/api/module-list.ts
@@ -1,22 +1,19 @@
-'use strict'
-
 const features = process.electronBinding('features')
 const v8Util = process.electronBinding('v8_util')

-const enableRemoteModule = v8Util.getHiddenValue(global, 'enableRemoteModule')
+const enableRemoteModule = v8Util.getHiddenValue<boolean>(global, 'enableRemoteModule')

 // Renderer side modules, please sort alphabetically.
-// A module is `enabled` if there is no explicit condition defined.
-module.exports = [
+export const rendererModuleList: ElectronInternal.ModuleEntry[] = [
  { name: 'crashReporter', loader: () => require('./crash-reporter') },
  { name: 'ipcRenderer', loader: () => require('./ipc-renderer') },
  { name: 'webFrame', loader: () => require('./web-frame') }
 ]

 if (features.isDesktopCapturerEnabled()) {
-  module.exports.push({ name: 'desktopCapturer', loader: () => require('./desktop-capturer') })
+  rendererModuleList.push({ name: 'desktopCapturer', loader: () => require('./desktop-capturer') })
 }

 if (enableRemoteModule) {
-  module.exports.push({ name: 'remote', loader: () => require('./remote') })
+  rendererModuleList.push({ name: 'remote', loader: () => require('./remote') })
 }
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -349,9 +349,8 @@ const addBuiltinProperty = (name) => {
  })
 }

-const browserModules =
-  require('@electron/internal/common/api/module-list').concat(
-    require('@electron/internal/browser/api/module-keys'))
+const { commonModuleList } = require('@electron/internal/common/api/module-list')
+const browserModules = commonModuleList.concat(require('@electron/internal/browser/api/module-keys'))

 // And add a helper receiver for each one.
 browserModules
--- a/lib/renderer/chrome-api.ts
+++ b/lib/renderer/chrome-api.ts
@@ -157,7 +157,7 @@ export function injectTo (extensionId: string, context: any) {
        console.error('options are not supported')
      }

-      ipcRendererUtils.invoke('CHROME_RUNTIME_SEND_MESSAGE', targetExtensionId, message).then(responseCallback)
+      ipcRendererInternal.invoke('CHROME_RUNTIME_SEND_MESSAGE', targetExtensionId, message).then(responseCallback)
    },

    onConnect: new Event(),
@@ -172,7 +172,7 @@ export function injectTo (extensionId: string, context: any) {
      details: Chrome.Tabs.ExecuteScriptDetails,
      resultCallback: Chrome.Tabs.ExecuteScriptCallback = () => {}
    ) {
-      ipcRendererUtils.invoke('CHROME_TABS_EXECUTE_SCRIPT', tabId, extensionId, details)
+      ipcRendererInternal.invoke('CHROME_TABS_EXECUTE_SCRIPT', tabId, extensionId, details)
        .then((result: any) => resultCallback([result]))
    },

@@ -183,7 +183,7 @@ export function injectTo (extensionId: string, context: any) {
      _options: Chrome.Tabs.SendMessageDetails,
      responseCallback: Chrome.Tabs.SendMessageCallback = () => {}
    ) {
-      ipcRendererUtils.invoke('CHROME_TABS_SEND_MESSAGE', tabId, extensionId, message).then(responseCallback)
+      ipcRendererInternal.invoke('CHROME_TABS_SEND_MESSAGE', tabId, extensionId, message).then(responseCallback)
    },

    onUpdated: new Event(),
--- a/lib/renderer/extensions/storage.ts
+++ b/lib/renderer/extensions/storage.ts
@@ -1,9 +1,9 @@
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'

 const getStorage = (storageType: string, extensionId: number, callback: Function) => {
  if (typeof callback !== 'function') throw new TypeError('No callback provided')

-  ipcRendererUtils.invoke<string>('CHROME_STORAGE_READ', storageType, extensionId)
+  ipcRendererInternal.invoke<string>('CHROME_STORAGE_READ', storageType, extensionId)
    .then(data => {
      if (data !== null) {
        callback(JSON.parse(data))
@@ -17,7 +17,7 @@ const getStorage = (storageType: string, extensionId: number, callback: Function

 const setStorage = (storageType: string, extensionId: number, storage: Record<string, any>, callback: Function) => {
  const json = JSON.stringify(storage)
-  ipcRendererUtils.invoke('CHROME_STORAGE_WRITE', storageType, extensionId, json)
+  ipcRendererInternal.invoke('CHROME_STORAGE_WRITE', storageType, extensionId, json)
    .then(() => {
      if (callback) callback()
    })
--- a/lib/renderer/inspector.ts
+++ b/lib/renderer/inspector.ts
@@ -1,4 +1,5 @@
-import { invoke, invokeSync } from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'
+import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'

 window.onload = function () {
  // Use menu API to show context menu.
@@ -19,7 +20,7 @@ function completeURL (project: string, path: string) {

 // The DOM implementation expects (message?: string) => boolean
 (window.confirm as any) = function (message: string, title: string) {
-  return invokeSync('ELECTRON_INSPECTOR_CONFIRM', message, title) as boolean
+  return ipcRendererUtils.invokeSync('ELECTRON_INSPECTOR_CONFIRM', message, title) as boolean
 }

 const useEditMenuItems = function (x: number, y: number, items: ContextMenuItem[]) {
@@ -32,7 +33,7 @@ const useEditMenuItems = function (x: number, y: number, items: ContextMenuItem[

 const createMenu = function (x: number, y: number, items: ContextMenuItem[]) {
  const isEditMenu = useEditMenuItems(x, y, items)
-  invoke<number>('ELECTRON_INSPECTOR_CONTEXT_MENU', items, isEditMenu).then(id => {
+  ipcRendererInternal.invoke<number>('ELECTRON_INSPECTOR_CONTEXT_MENU', items, isEditMenu).then(id => {
    if (typeof id === 'number') {
      window.DevToolsAPI!.contextMenuItemSelected(id)
    }
@@ -41,7 +42,7 @@ const createMenu = function (x: number, y: number, items: ContextMenuItem[]) {
 }

 const showFileChooserDialog = function (callback: (blob: File) => void) {
-  invoke<[ string, any ]>('ELECTRON_INSPECTOR_SELECT_FILE').then(([path, data]) => {
+  ipcRendererInternal.invoke<[ string, any ]>('ELECTRON_INSPECTOR_SELECT_FILE').then(([path, data]) => {
    if (path && data) {
      callback(dataToHtml5FileObject(path, data))
    }
--- a/lib/renderer/ipc-renderer-internal-utils.ts
+++ b/lib/renderer/ipc-renderer-internal-utils.ts
@@ -4,38 +4,18 @@ import * as errorUtils from '@electron/internal/common/error-utils'
 type IPCHandler = (event: Electron.IpcRendererEvent, ...args: any[]) => any

 export const handle = function <T extends IPCHandler> (channel: string, handler: T) {
-  ipcRendererInternal.on(channel, (event, requestId, ...args) => {
-    new Promise(resolve => resolve(handler(event, ...args))
-    ).then(result => {
-      return [null, result]
-    }, error => {
-      return [errorUtils.serialize(error)]
-    }).then(responseArgs => {
-      event.sender.send(`${channel}_RESPONSE_${requestId}`, ...responseArgs)
-    })
-  })
-}
-
-let nextId = 0
-
-export function invoke<T> (command: string, ...args: any[]) {
-  return new Promise<T>((resolve, reject) => {
-    const requestId = ++nextId
-    ipcRendererInternal.once(`${command}_RESPONSE_${requestId}`, (
-      _event, error: Electron.SerializedError, result: any
-    ) => {
-      if (error) {
-        reject(errorUtils.deserialize(error))
-      } else {
-        resolve(result)
-      }
-    })
-    ipcRendererInternal.send(command, requestId, ...args)
+  ipcRendererInternal.on(channel, async (event, requestId, ...args) => {
+    const replyChannel = `${channel}_RESPONSE_${requestId}`
+    try {
+      event.sender.send(replyChannel, null, await handler(event, ...args))
+    } catch (error) {
+      event.sender.send(replyChannel, errorUtils.serialize(error))
+    }
  })
 }

 export function invokeSync<T> (command: string, ...args: any[]): T {
-  const [ error, result ] = ipcRendererInternal.sendSync(command, null, ...args)
+  const [ error, result ] = ipcRendererInternal.sendSync(command, ...args)

  if (error) {
    throw errorUtils.deserialize(error)
--- a/lib/renderer/ipc-renderer-internal.ts
+++ b/lib/renderer/ipc-renderer-internal.ts
@@ -20,3 +20,11 @@ ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
 ipcRendererInternal.sendToAll = function (webContentsId, channel, ...args) {
  return ipc.sendTo(internal, true, webContentsId, channel, args)
 }
+
+ipcRendererInternal.invoke = async function<T> (channel: string, ...args: any[]) {
+  const { error, result } = await ipc.invoke<T>(internal, channel, args)
+  if (error) {
+    throw new Error(`Error invoking remote method '${channel}': ${error}`)
+  }
+  return result
+}
--- a/lib/renderer/security-warnings.ts
+++ b/lib/renderer/security-warnings.ts
@@ -1,5 +1,5 @@
 import { webFrame } from 'electron'
-import { invoke } from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'

 let shouldLog: boolean | null = null

@@ -299,7 +299,7 @@ const logSecurityWarnings = function (

 const getWebPreferences = async function () {
  try {
-    return invoke<Electron.WebPreferences>('ELECTRON_BROWSER_GET_LAST_WEB_PREFERENCES')
+    return ipcRendererInternal.invoke<Electron.WebPreferences>('ELECTRON_BROWSER_GET_LAST_WEB_PREFERENCES')
  } catch (error) {
    console.warn(`getLastWebPreferences() failed: ${error}`)
  }
--- a/lib/renderer/web-view/guest-view-internal.ts
+++ b/lib/renderer/web-view/guest-view-internal.ts
@@ -1,6 +1,6 @@
 import { webFrame, IpcMessageEvent } from 'electron'
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'
-import { invoke, invokeSync } from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'

 import { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl'

@@ -93,11 +93,11 @@ export function deregisterEvents (viewInstanceId: number) {
 }

 export function createGuest (params: Record<string, any>): Promise<number> {
-  return invoke('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params)
+  return ipcRendererInternal.invoke('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params)
 }

 export function createGuestSync (params: Record<string, any>): number {
-  return invokeSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params)
+  return ipcRendererUtils.invokeSync('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params)
 }

 export function attachGuest (
@@ -107,7 +107,7 @@ export function attachGuest (
  if (embedderFrameId < 0) { // this error should not happen.
    throw new Error('Invalid embedder frame')
  }
-  invoke('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', embedderFrameId, elementInstanceId, guestInstanceId, params)
+  ipcRendererInternal.invoke('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', embedderFrameId, elementInstanceId, guestInstanceId, params)
 }

 export const guestViewInternalModule = {
--- a/lib/renderer/web-view/web-view-attributes.ts
+++ b/lib/renderer/web-view/web-view-attributes.ts
@@ -1,4 +1,4 @@
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'
 import { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl'
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants'

@@ -196,7 +196,7 @@ class SrcAttribute extends WebViewAttribute {
    const method = 'loadURL'
    const args = [this.getValue(), opts]

-    ipcRendererUtils.invoke('ELECTRON_GUEST_VIEW_MANAGER_CALL', guestInstanceId, method, args)
+    ipcRendererInternal.invoke('ELECTRON_GUEST_VIEW_MANAGER_CALL', guestInstanceId, method, args)
  }
 }

--- a/lib/renderer/web-view/web-view-impl.ts
+++ b/lib/renderer/web-view/web-view-impl.ts
@@ -1,5 +1,6 @@
 import { remote, webFrame } from 'electron'

+import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal'
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
 import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal'
 import { WEB_VIEW_CONSTANTS } from '@electron/internal/renderer/web-view/web-view-constants'
@@ -253,7 +254,7 @@ export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElem

  const createNonBlockHandler = function (method: string) {
    return function (this: ElectronInternal.WebViewElement, ...args: Array<any>) {
-      return ipcRendererUtils.invoke('ELECTRON_GUEST_VIEW_MANAGER_CALL', this.getWebContentsId(), method, args)
+      return ipcRendererInternal.invoke('ELECTRON_GUEST_VIEW_MANAGER_CALL', this.getWebContentsId(), method, args)
    }
  }

--- a/lib/renderer/window-setup.ts
+++ b/lib/renderer/window-setup.ts
@@ -106,7 +106,7 @@ class LocationProxy {
  }

  private _invokeWebContentsMethod (method: string, ...args: any[]) {
-    return ipcRendererUtils.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, method, ...args)
+    return ipcRendererInternal.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, method, ...args)
  }

  private _invokeWebContentsMethodSync (method: string, ...args: any[]) {
@@ -158,7 +158,7 @@ class BrowserWindowProxy {
  }

  public postMessage (message: any, targetOrigin: string) {
-    ipcRendererUtils.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, toString(targetOrigin), window.location.origin)
+    ipcRendererInternal.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, toString(targetOrigin), window.location.origin)
  }

  public eval (code: string) {
@@ -166,11 +166,11 @@ class BrowserWindowProxy {
  }

  private _invokeWindowMethod (method: string, ...args: any[]) {
-    return ipcRendererUtils.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, method, ...args)
+    return ipcRendererInternal.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, method, ...args)
  }

  private _invokeWebContentsMethod (method: string, ...args: any[]) {
-    return ipcRendererUtils.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, method, ...args)
+    return ipcRendererInternal.invoke('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, method, ...args)
  }
 }

--- a/lib/sandboxed_renderer/api/exports/electron.js
+++ b/lib/sandboxed_renderer/api/exports/electron.js
@@ -1,25 +0,0 @@
-'use strict'
-
-const moduleList = require('@electron/internal/sandboxed_renderer/api/module-list')
-
-const handleESModule = (m) => {
-  // Handle Typescript modules with an "export default X" statement
-  if (m.__esModule && m.default) return m.default
-  return m
-}
-
-for (const {
-  name,
-  load,
-  enabled = true,
-  private: isPrivate = false
-} of moduleList) {
-  if (!enabled) {
-    continue
-  }
-
-  Object.defineProperty(exports, name, {
-    enumerable: !isPrivate,
-    get: () => handleESModule(load())
-  })
-}
--- a/lib/sandboxed_renderer/api/exports/electron.ts
+++ b/lib/sandboxed_renderer/api/exports/electron.ts
@@ -0,0 +1,4 @@
+import { defineProperties } from '@electron/internal/common/define-properties'
+import { moduleList } from '@electron/internal/sandboxed_renderer/api/module-list'
+
+defineProperties(exports, moduleList)
--- a/lib/sandboxed_renderer/api/module-list.js
+++ b/lib/sandboxed_renderer/api/module-list.js
@@ -1,38 +0,0 @@
-'use strict'
-
-const features = process.electronBinding('features')
-
-module.exports = [
-  {
-    name: 'crashReporter',
-    load: () => require('@electron/internal/renderer/api/crash-reporter')
-  },
-  {
-    name: 'desktopCapturer',
-    load: () => require('@electron/internal/renderer/api/desktop-capturer'),
-    enabled: features.isDesktopCapturerEnabled()
-  },
-  {
-    name: 'ipcRenderer',
-    load: () => require('@electron/internal/renderer/api/ipc-renderer')
-  },
-  {
-    name: 'nativeImage',
-    load: () => require('@electron/internal/common/api/native-image')
-  },
-  {
-    name: 'remote',
-    load: () => require('@electron/internal/renderer/api/remote'),
-    enabled: process.isRemoteModuleEnabled
-  },
-  {
-    name: 'webFrame',
-    load: () => require('@electron/internal/renderer/api/web-frame')
-  },
-  // The internal modules, invisible unless you know their names.
-  {
-    name: 'deprecate',
-    load: () => require('@electron/internal/common/api/deprecate'),
-    private: true
-  }
-]
--- a/lib/sandboxed_renderer/api/module-list.ts
+++ b/lib/sandboxed_renderer/api/module-list.ts
@@ -0,0 +1,40 @@
+const features = process.electronBinding('features')
+
+export const moduleList: ElectronInternal.ModuleEntry[] = [
+  {
+    name: 'crashReporter',
+    loader: () => require('@electron/internal/renderer/api/crash-reporter')
+  },
+  {
+    name: 'ipcRenderer',
+    loader: () => require('@electron/internal/renderer/api/ipc-renderer')
+  },
+  {
+    name: 'nativeImage',
+    loader: () => require('@electron/internal/common/api/native-image')
+  },
+  {
+    name: 'webFrame',
+    loader: () => require('@electron/internal/renderer/api/web-frame')
+  },
+  // The internal modules, invisible unless you know their names.
+  {
+    name: 'deprecate',
+    loader: () => require('@electron/internal/common/api/deprecate'),
+    private: true
+  }
+]
+
+if (features.isDesktopCapturerEnabled()) {
+  moduleList.push({
+    name: 'desktopCapturer',
+    loader: () => require('@electron/internal/renderer/api/desktop-capturer')
+  })
+}
+
+if (process.isRemoteModuleEnabled) {
+  moduleList.push({
+    name: 'remote',
+    loader: () => require('@electron/internal/renderer/api/remote')
+  })
+}
--- a/native_mate/native_mate/arguments.h
+++ b/native_mate/native_mate/arguments.h
@@ -9,6 +9,7 @@
 #include <vector>

 #include "base/macros.h"
+#include "base/optional.h"
 #include "native_mate/converter.h"

 namespace mate {
@@ -34,6 +35,17 @@ class Arguments {
    return ConvertFromV8(isolate_, info_->Data(), out);
  }

+  template <typename T>
+  bool GetNext(base::Optional<T>* out) {
+    if (next_ >= info_->Length())
+      return true;
+    v8::Local<v8::Value> val = (*info_)[next_];
+    bool success = ConvertFromV8(isolate_, val, out);
+    if (success)
+      next_++;
+    return success;
+  }
+
  template <typename T>
  bool GetNext(T* out) {
    if (next_ >= info_->Length()) {
--- a/native_mate/native_mate/function_template.h
+++ b/native_mate/native_mate/function_template.h
@@ -5,6 +5,7 @@
 #ifndef NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
 #define NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_

+#include "../shell/common/error_util.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "native_mate/arguments.h"
@@ -128,6 +129,16 @@ inline bool GetNextArgument(Arguments* args,
  return true;
 }

+// Allow clients to pass a util::Error to throw errors if they
+// don't need the full mate::Arguments
+inline bool GetNextArgument(Arguments* args,
+                            int create_flags,
+                            bool is_first,
+                            electron::util::ErrorThrower* result) {
+  *result = electron::util::ErrorThrower(args->isolate());
+  return true;
+}
+
 // Classes for generating and storing an argument pack of integer indices
 // (based on well-known "indices trick", see: http://goo.gl/bKKojn):
 template <size_t... indices>
--- a/npm/install.js
+++ b/npm/install.js
@@ -58,6 +58,7 @@ function getPlatformPath () {
    case 'darwin':
      return 'Electron.app/Contents/MacOS/Electron'
    case 'freebsd':
+    case 'openbsd':
    case 'linux':
      return 'electron'
    case 'win32':
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "electron",
-  "version": "8.0.0-nightly.20190819",
+  "version": "8.0.0-nightly.20190825",
  "repository": "https://github.com/electron/electron",
  "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
  "devDependencies": {
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -67,10 +67,10 @@ worker_context_will_destroy.patch
 fix_breakpad_symbol_generation_on_linux_arm.patch
 frame_host_manager.patch
 crashpad_pid_check.patch
-chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch
 network_service_allow_remote_certificate_verification_logic.patch
 put_back_deleted_colors_for_autofill.patch
 build_win_disable_zc_twophase.patch
 disable_color_correct_rendering.patch
 add_contentgpuclient_precreatemessageloop_callback.patch
-fix_vc_incompatible_inline_calls.patch
+picture-in-picture.patch
+disable_compositor_recycling.patch
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -1,12 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Milan Burda <milan.burda@gmail.com>
 Date: Thu, 11 Apr 2019 14:49:20 +0200
-Subject: Add ContentGpuClient::PreCreateMessageLoop() callback
+Subject: add_contentgpuclient_precreatemessageloop_callback.patch

+This adds a ContentGpuClient::PreCreateMessageLoop() callback.
 Invoke in GpuMain after SetErrorMode, before starting the message loop.
 Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.

-This should be upstreamed
+This should be upstreamed.

 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
 index 46d92835eadd6429ea0c6a53c5a39ff04f1c2634..1b99a1e601f4226280cdf1382af555b4d61b92fa 100644
--- a/patches/chromium/add_realloc.patch
+++ b/patches/chromium/add_realloc.patch
@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
 
   GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index e44b0d054d61914b43f4a3c36fa2578f452e1797..8b46714d15db976968ad084e7941ab503e11e65d 100644
+index 7ca876bc7f2afa192167f0689690d73d5a420c60..d58085e0b14241d666f533cb23dd89159c27d8b2 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -644,6 +644,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -642,6 +642,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
         size, WTF::ArrayBufferContents::kDontInitialize);
   }
 
@@ -70,10 +70,10 @@ index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755
   Partitions::ArrayBufferPartition()->Free(data);
 }
 diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-index 929468d9d4885953576b777785609e9b54d5ebd0..ee35b4782b9797278209280c2a031e5f3d5ce6c6 100644
+index ee7c89a4950d6b3c97a810c41a62fee7e372018d..c2b60f20a72cca46d05af369f33d9c19395b34ef 100644
 --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
 +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-@@ -135,6 +135,7 @@ class WTF_EXPORT ArrayBufferContents {
+@@ -140,6 +140,7 @@ class WTF_EXPORT ArrayBufferContents {
   void CopyTo(ArrayBufferContents& other);
 
   static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
--- a/patches/chromium/autofill_size_calculation.patch
+++ b/patches/chromium/autofill_size_calculation.patch
@@ -1,12 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Heilig Benedek <benecene@gmail.com>
 Date: Wed, 30 Jan 2019 17:04:33 +0100
-Subject: don't call into chrome internals for autofill popup size calculations
+Subject: autofill_size_calculation.patch

-The default GetWindowBounds calls into chrome internal functions to
-find out the size of the window - this can be overridden but even
-then some methods call into the original. Let's just return an empty
-gfx::Rect and do the actual job in the subclass.
+We don't want to call into chrome internals for autofill popup size
+calculations. The default GetWindowBounds calls into chrome internal
+functions to find out the size of the window - this can be overridden
+but even then some methods call into the original. Let's just return
+an empty gfx::Rect and do the actual job in the subclass.

 diff --git a/chrome/browser/ui/autofill/popup_view_common.cc b/chrome/browser/ui/autofill/popup_view_common.cc
 index 25e2cfce4999bdf6a94d61aae4558470d18f89ed..c9880bcd639eb59ae52c38dbdabbd86ebac3b530 100644
--- a/patches/chromium/blink_initialization_order.patch
+++ b/patches/chromium/blink_initialization_order.patch
@@ -10,7 +10,7 @@ to fix electron/electron#13787.  The backport landed in Chromium 67 but the
 DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely

 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index b6622fd132cc1b46127a2157b28c2fd2ab63e40d..1a3196aa5737e35237fd467260973fdf260587c4 100644
+index c0ec993ca6d96c5f95eb7b918ca9c37d9defff43..2522add8f9b1e3ada14fcc5c09d161b0820f4418 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -205,11 +205,10 @@ void LocalWindowProxy::Initialize() {
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -14,7 +14,7 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.

 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index f4e7059fa98be4470cf20c26fd7260a442b25585..8eefe09f6ebbc02e3bca3d111c3b47d509a7a2a4 100644
+index 488d9238eec29fd90540881d895f86d8597300be..b9cbd011d8ab5f86128590b2b98a517a5ad04c4e 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -334,10 +334,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
--- a/patches/chromium/blink_world_context.patch
+++ b/patches/chromium/blink_world_context.patch
@@ -19,10 +19,10 @@ index a781a44399a31f048419311d2317229c912752c2..131c0dcb125b00215e3ad469c11c4b47
   // that the script evaluated to with callback. Script execution can be
   // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 050494ce5d2389b81fab27506f8ff2204126eb6b..93632d57953a69be01ae5b6b9777d8a6b417b3f3 100644
+index 85481bb0178d707bb52a4766521cdd8f740b0497..e3d4e5284c13383db47153adb5f8e3d9fce64dbf 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -866,6 +866,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -874,6 +874,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
   return MainWorldScriptContext()->Global();
 }
 
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <sattard@slack-corp.com>
 Date: Tue, 23 Apr 2019 09:51:43 -0700
-Subject: build: add electron tracing category
+Subject: build_add_electron_tracing_category.patch

 All TRACE events in Chromium use a static assert to ensure that the
 categories in use are known / declared.  This patch is required for us
-to introduce a new Electron category.
+to introduce a new Electron category for Electron-specific tracing.

 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
 index b50d4123e44ddee34af0b07bfe5d067c4ccc5809..3e2c639a067fb76848783f35ec112a380da2353e 100644
--- a/patches/chromium/build_win_disable_zc_twophase.patch
+++ b/patches/chromium/build_win_disable_zc_twophase.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Tue, 16 Jul 2019 14:38:52 -0700
-Subject: build: Temporarily disable /Zc:twoPhase when libcxx is not used on
- windows.
+Subject: build_win_disable_zc_twophase.patch

-This is to workaround the bug in crbug.com/969698#c10
+Temporarily disable /Zc:twoPhase when libcxx is not used on
+Windows. This is to workaround the bug in crbug.com/969698#c10
 until fixes have landed in upstream.

 diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
-index 8406c060c4e61282433ad40a52744fd7ea80366b..0bb1b871be97fe8275e17669ed0bcd77d9645f9b 100644
+index edb193a5f3ac04b1ea017d3744a5ac1383fc055b..459368d9885f26f80c6bbef452a3be0706cb7c13 100644
 --- a/build/config/win/BUILD.gn
 +++ b/build/config/win/BUILD.gn
@@ -2,6 +2,7 @@
@@ -19,7 +19,7 @@ index 8406c060c4e61282433ad40a52744fd7ea80366b..0bb1b871be97fe8275e17669ed0bcd77
 import("//build/config/chrome_build.gni")
 import("//build/config/clang/clang.gni")
 import("//build/config/compiler/compiler.gni")
-@@ -67,9 +68,13 @@ config("compiler") {
+@@ -61,9 +62,13 @@ config("compiler") {
     "/FS",  # Preserve previous PDB behavior.
     "/bigobj",  # Some of our files are bigger than the regular limits.
     "/utf-8",  # Assume UTF-8 by default to avoid code page dependencies.
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -5,10 +5,10 @@ Subject: can_create_window.patch


 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 269bffc6ebfcf926718aed78f0c1d65e0c21b8b4..98069a4d2e2ab2cf1d880392ece8578c5317a6ef 100644
+index c6381fe498311421d2568b6d91b33539eb72cb0b..90b2457b49cb9c68a0dd269e8e8f64a44cae80cf 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -3871,6 +3871,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -3885,6 +3885,7 @@ void RenderFrameHostImpl::CreateNewWindow(
           last_committed_origin_, params->window_container_type,
           params->target_url, params->referrer.To<Referrer>(),
           params->frame_name, params->disposition, *params->features,
@@ -17,10 +17,10 @@ index 269bffc6ebfcf926718aed78f0c1d65e0c21b8b4..98069a4d2e2ab2cf1d880392ece8578c
           &no_javascript_access);
 
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 380029a373ce17816824c18803ed68380276eaa1..3a846621febecab61a26b31753fdd1d63958ec47 100644
+index e227f780d720a80a13699f475757142571094cd1..6984f69e6f9a0d3058b0054df8a3aa9d46f14dbd 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -303,6 +303,10 @@ struct CreateNewWindowParams {
+@@ -299,6 +299,10 @@ struct CreateNewWindowParams {
 
   // The window features to use for the new window.
   blink.mojom.WindowFeatures features;
@@ -32,10 +32,10 @@ index 380029a373ce17816824c18803ed68380276eaa1..3a846621febecab61a26b31753fdd1d6
 
 // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index d9f7d1d1aed10c7cd8e7c2938d1fb824b2dce96d..4d4710e8c5382ac9391bb693dc1fd42258efd181 100644
+index 1c904cd011b7a5ca9592a994cf4ba0be025eef55..15081967b0a29316ab82746ca6fe7d188a9efc58 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -475,6 +475,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -484,6 +484,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -45,10 +45,10 @@ index d9f7d1d1aed10c7cd8e7c2938d1fb824b2dce96d..4d4710e8c5382ac9391bb693dc1fd422
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 02a0dbcbc2df521079519ecd5464ecd251fdcaec..897c2c1435a8c1a495aa84c928c360d74218bfa7 100644
+index 07dc81e27ae92e4e7a872134dcdc6a3ba2e08ec5..678b25401338a624dc37a11c45331d65082934e9 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -177,6 +177,7 @@ class RenderFrameHost;
+@@ -178,6 +178,7 @@ class RenderFrameHost;
 class RenderProcessHost;
 class RenderViewHost;
 class ResourceContext;
@@ -56,7 +56,7 @@ index 02a0dbcbc2df521079519ecd5464ecd251fdcaec..897c2c1435a8c1a495aa84c928c360d7
 class SerialDelegate;
 class SiteInstance;
 class SpeechRecognitionManagerDelegate;
-@@ -759,6 +760,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -767,6 +768,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@@ -66,7 +66,7 @@ index 02a0dbcbc2df521079519ecd5464ecd251fdcaec..897c2c1435a8c1a495aa84c928c360d7
       bool opener_suppressed,
       bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 31790be7369a450dec9c2c9a53d0b1a80ee4c41e..e7f22166a777b05f28a78e51934bfc1eb5ea99c8 100644
+index a8a2d29739aabb0bd80cb77e28c46de57afe2b10..e3fa35b439e0f945e9e6a95587561fedd1ef4a2c 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
@@ -75,6 +75,7 @@
@@ -77,7 +77,7 @@ index 31790be7369a450dec9c2c9a53d0b1a80ee4c41e..e7f22166a777b05f28a78e51934bfc1e
 #include "content/renderer/media/audio/audio_device_factory.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 #include "content/renderer/media/webrtc/rtc_peer_connection_handler.h"
-@@ -1358,6 +1359,8 @@ WebView* RenderViewImpl::CreateView(
+@@ -1346,6 +1347,8 @@ WebView* RenderViewImpl::CreateView(
   }
   params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
 
@@ -87,10 +87,10 @@ index 31790be7369a450dec9c2c9a53d0b1a80ee4c41e..e7f22166a777b05f28a78e51934bfc1e
   // moved on send.
   bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index 4c639ff453f778bee39726231c920fa6e0b65134..3367f6982e047dcc3654ed20e21b74dbb90dc9cc 100644
+index 1a159e8d2877e5b1c6778b68aec5b36fb88214fd..f9111b3e20fb7607faa4bb605be1ff4c385e40d6 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -305,6 +305,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -313,6 +313,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -100,7 +100,7 @@ index 4c639ff453f778bee39726231c920fa6e0b65134..3367f6982e047dcc3654ed20e21b74db
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
-index 8fe2e1d0b24f42ba7b2c7e40db78a3ed1d6f8341..7e6459e68ad3611b128d7f7f7604b77a66c40435 100644
+index 1a714946de9f0dceaec008e93928d2c414ef01da..34423135e85b3ed7a54c9f22f6674f9c4026a67c 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.h
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.h
@@ -67,6 +67,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
--- a/patches/chromium/chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch
+++ b/patches/chromium/chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Wed, 5 Jun 2019 15:11:00 -0700
-Subject: chore: add debounce on the updateWebContentsVisibility method to
- ensure quick changes in occlusion do not result in flickering
-
-diff --git a/content/app_shim_remote_cocoa/web_contents_view_cocoa.h b/content/app_shim_remote_cocoa/web_contents_view_cocoa.h
-index 230e259f6017310e556d11dec43973b74015f191..ebd19fc31efef50677da417dfd69f0c8cce6c682 100644
--- a/content/app_shim_remote_cocoa/web_contents_view_cocoa.h
-+++ b/content/app_shim_remote_cocoa/web_contents_view_cocoa.h
-@@ -58,6 +58,8 @@ CONTENT_EXPORT
-                        offset:(NSPoint)offset;
- - (void)clearViewsHostableView;
- - (void)updateWebContentsVisibility;
-+- (remote_cocoa::mojom::Visibility)currentVisibility;
-+- (void)notifyWebContentsVisibilityChanged;
- - (void)viewDidBecomeFirstResponder:(NSNotification*)notification;
- @end
- 
-diff --git a/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm b/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
-index 615fe671d415747cb84f673327629d3dc771039e..6c31ba5b9149161784f5813598ddcf30e2d8af2a 100644
--- a/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
-+++ b/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
-@@ -257,9 +257,14 @@ - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
-   host_->OnBecameFirstResponder(direction);
- }
- 
-- (void)updateWebContentsVisibility {
-+- (void)notifyWebContentsVisibilityChanged {
-   if (!host_)
-     return;
-+
-+  host_->OnWindowVisibilityChanged([self currentVisibility]);
-+}
-+
-+- (Visibility)currentVisibility {
-   Visibility visibility = Visibility::kVisible;
-   if ([self isHiddenOrHasHiddenAncestor] || ![self window])
-     visibility = Visibility::kHidden;
-@@ -267,7 +272,24 @@ - (void)updateWebContentsVisibility {
-     visibility = Visibility::kVisible;
-   else
-     visibility = Visibility::kOccluded;
-  host_->OnWindowVisibilityChanged(visibility);
-+  return visibility;
-+}
-+
-+- (void)updateWebContentsVisibility {
-+  if (!host_)
-+    return;
-+  // Cancel any pending notifications visibility changes, this ensures that the latest incoming change is the only
-+  // change that will take affect
-+  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(notifyWebContentsVisibilityChanged) object:nil];
-+
-+  Visibility visibility = [self currentVisibility];
-+
-+  // If it's visible, notify immediately to render ASAP
-+  if (visibility == Visibility::kVisible)
-+    host_->OnWindowVisibilityChanged(visibility);
-+  else
-+    // If it's occluded queue it for 3 seconds to be sure that it isn't a double kOccluded -> kVisible
-+    [self performSelector:@selector(notifyWebContentsVisibilityChanged) withObject:nil afterDelay:3.0];
- }
- 
- - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -1,9 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <jeremya@chromium.org>
 Date: Wed, 10 Oct 2018 15:07:34 -0700
-Subject: define Command::IsMediaKey on mac
+Subject: command-ismediakey.patch

-the definition is copied from //chrome/common/extensions/command.cc,
+define Command::IsMediaKey on mac; copied from //chrome/common/extensions/command.cc,
 which also defines a bunch of other stuff that depends on extensions.
 since we only need IsMediaKey, and we don't want the extensions stuff
 (and aren't compiling command.cc), it's safe to duplicate the
--- a/patches/chromium/content_browser_main_loop.patch
+++ b/patches/chromium/content_browser_main_loop.patch
@@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
 in atom::CommonWebContentsDelegate::ResetManageWebContents.

 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index 5acff0fbb0babb3fd46d6ec716910f3c97bc73dc..561a5dcb6bbca381875f4765b52fc0df2d5f6d4b 100644
+index 61324582c2dca5e1e5a75c0793034307b648cc98..c73c1e26c2f01713952840fadbd7e8975bcb9843 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1492,7 +1492,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1496,7 +1496,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
   NOTREACHED();
 #else
   base::RunLoop run_loop;
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -46,7 +46,7 @@ index 4bc8bd4c68015dd684702a6afbce74b36160e5a1..55dc200a73ef09b17c0e52d622f86956
   // navigation. Now we know that the renderer has updated its state accordingly
   // and it is safe to also clear the browser side history.
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
-index 82bdc4eccf06b7c636dd48cfffebe2606c2cff38..c4385984ebc23bc0a89e7e6ae7d42715a707177d 100644
+index 87a82009c929ff73d3d9fe5b51907b9b4147f78f..32d2316d7553b672a28e84f9433c85d1be213623 100644
 --- a/ui/base/clipboard/clipboard_win.cc
 +++ b/ui/base/clipboard/clipboard_win.cc
@@ -729,9 +729,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -36,7 +36,7 @@ index 8e02a8a95eb07516162eacdf5b361231d3a02975..3497b85428a52c6019cfb5d30229071f
   virtual content::DesktopMediaID::Type GetMediaListType() const = 0;
 };
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-index 983a8303b11527cdab449d03485653b8c27102de..1362161da462be4eb70f9e698eb274c1890ac0ab 100644
+index 7346429314858b4ce7e5caaea7c3328ca22b1b02..fd98c0eb68f04f9f3bdbe8c77cfeb523d685ba87 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
@@ -21,6 +21,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period)
@@ -94,9 +94,9 @@ index 983a8303b11527cdab449d03485653b8c27102de..1362161da462be4eb70f9e698eb274c1
 void DesktopMediaListBase::ScheduleNextRefresh() {
 +  if (!observer_->ShouldScheduleNextRefresh(this))
 +    return;
-   base::PostDelayedTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                                   base::BindOnce(&DesktopMediaListBase::Refresh,
-                                                  weak_factory_.GetWeakPtr()),
+   base::PostDelayedTask(FROM_HERE, {BrowserThread::UI},
+                         base::BindOnce(&DesktopMediaListBase::Refresh,
+                                        weak_factory_.GetWeakPtr()),
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
 index 29ef83096f7a7c69c67e9ad1bee2c45723e58f3f..ec228a826b298eb590f15c843e3346460ae13321 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -133,7 +133,7 @@ index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b5
  protected:
   virtual ~DesktopMediaListObserver() {}
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index dca0ffdfb9fda6ecf45b428cb253e10f8799a6c3..8d09e13073c580ca89e76976a8acc65f4b421868 100644
+index b2005c70acbc1c05c59bb2059b190ab78fb63a68..1a7188e2df76672d66da3206d4448df35a065754 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -8,14 +8,15 @@
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821

 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index c578a96ba41f1a75d8a1ab80321b48fa72ad84ab..7f9405b7f484ef05d222581d222d104f20aa1de1 100644
+index 578b8414531f10ed1fe9d1590336a43ba8dd299f..82e1491988dc31573ae8b15bf6df16fabda1616e 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
@@ -331,6 +331,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -49,12 +49,12 @@ index c578a96ba41f1a75d8a1ab80321b48fa72ad84ab..7f9405b7f484ef05d222581d222d104f
 // HWNDMessageHandler, gfx::WindowImpl overrides:
 
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 3bccc5ccdcfecd4a407fab48d70b8fccd0072f60..d726e974e83eee02489fc0669ef31f00ee75a572 100644
+index 57bf68676b697fa2d17c66f08b98d57809d4d20c..86ee2d878f2f310db2f50be05035f087ddb375ba 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
@@ -194,6 +194,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
   using TouchIDs = std::set<DWORD>;
-   enum class DwmFrameState { OFF, ON };
+   enum class DwmFrameState { kOff, kOn };
 
 +  bool HasNativeFrame();
 +
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -1,9 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Birunthan Mohanathas <birunthan@mohanathas.com>
 Date: Fri, 30 Nov 2018 12:44:12 +0200
-Subject: Add --disable-color-correct-rendering switch
+Subject: disable_color_correct_rendering.patch

-In Electron 2.0, `--disable-features=ColorCorrectRendering` could be
+This adds a --disable-color-correct-rendering switch. In Electron 2.0,
+`--disable-features=ColorCorrectRendering` could be
 used to make the app use the display color space (e.g. P3 on Macs)
 instead of color correcting to sRGB. Because color correct rendering is
 always enabled on Chromium 62 and later and because
@@ -65,7 +66,7 @@ index f17aa1fa451f1b99d7f083e07edd49b11f7639e4..09f7c5d6a92d89c199b296771a8ff60c
       !command_line->HasSwitch(switches::kUIDisablePartialSwap);
 #if defined(OS_MACOSX)
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index bc58f3ea501540cbbba465cd8b751b99df45ab3a..e0ee85b9319938c285eb7f19f1b010b408019081 100644
+index 58717216158d62dd2826007fa3ddb4f39a5eb4d1..b8c0fcbd2aadd7c75c90baf39c1166404c4209b0 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
@@ -81,6 +81,9 @@
@@ -175,7 +176,7 @@ index bc58f3ea501540cbbba465cd8b751b99df45ab3a..e0ee85b9319938c285eb7f19f1b010b4
 
   gfx::ColorSpace adjusted_color_space = src_color_space;
   float sdr_white_level = current_frame()->sdr_white_level;
-@@ -3553,7 +3560,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -3550,7 +3557,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
 
   *overlay_texture = FindOrCreateOverlayTexture(
       params.quad->render_pass_id, iosurface_width, iosurface_height,
@@ -184,7 +185,7 @@ index bc58f3ea501540cbbba465cd8b751b99df45ab3a..e0ee85b9319938c285eb7f19f1b010b4
   *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                            gfx::SizeF((*overlay_texture)->texture.size()));
 
-@@ -3771,8 +3778,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -3768,8 +3775,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
 
   PrepareGeometry(SHARED_BINDING);
 
@@ -195,7 +196,7 @@ index bc58f3ea501540cbbba465cd8b751b99df45ab3a..e0ee85b9319938c285eb7f19f1b010b4
 
   gfx::Transform render_matrix;
   render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -3932,3 +3939,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
+@@ -3929,3 +3936,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
 }
 
 }  // namespace viz
@@ -214,10 +215,10 @@ index 157fbbc34a2217f58f3e5931e1d56d6db3b876cd..68bd4a84e6fe68a4741fcedc50fb4723
     service_manager::switches::kGpuSandboxAllowSysVShm,
     service_manager::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 44ebf7ec0549dadd9621339260c92cbc424b096c..235d382c88327b7a09679b745c28622d78ce12b6 100644
+index 6302948343ee810a9d35a70be0c91a1ffbfb7647..6607c71fa295cda32c5ac00aafe642a103703a0e 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -216,6 +216,7 @@
+@@ -215,6 +215,7 @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/display/display_switches.h"
@@ -225,7 +226,7 @@ index 44ebf7ec0549dadd9621339260c92cbc424b096c..235d382c88327b7a09679b745c28622d
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_features.h"
 #include "url/url_constants.h"
-@@ -2894,6 +2895,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -2917,6 +2918,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
   // Propagate the following switches to the renderer command line (along
   // with any associated values) if present in the browser command line.
   static const char* const kSwitchNames[] = {
@@ -234,10 +235,10 @@ index 44ebf7ec0549dadd9621339260c92cbc424b096c..235d382c88327b7a09679b745c28622d
     network::switches::kExplicitlyAllowedPorts,
     service_manager::switches::kDisableInProcessStackTraces,
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
-index 91428916eaf20743f54d33df3b7930f52d24e709..879a48448ea9a0c62a1e2e070531be90e49e19ac 100644
+index 2f53bc7d22c175a41e71fcbf46b8ce2636e529e3..0eb3d2922453014e90a8f91e2f72aee3145f8cc6 100644
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
-@@ -2840,6 +2840,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
+@@ -2836,6 +2836,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
   settings.main_frame_before_activation_enabled =
       cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
 
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andy Locascio <andy@slack-corp.com>
+Date: Wed, 21 Aug 2019 12:09:10 -0700
+Subject: fix: disabling compositor recycling
+
+Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
+
+diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
+index 18019d5794f688ca07b35a665cc9800bb1d3047a..60c7e980dd322ba012c564fca68848c3188ca5dc 100644
+--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
+@@ -209,7 +209,7 @@
+ }
+ 
+ void BrowserCompositorMac::SetRenderWidgetHostIsHidden(bool hidden) {
+-  render_widget_host_is_hidden_ = hidden;
+  render_widget_host_is_hidden_ = false;
+   UpdateState();
+ }
+ 
--- a/patches/chromium/disable_custom_libcxx_on_windows.patch
+++ b/patches/chromium/disable_custom_libcxx_on_windows.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nitish Sakhawalkar <nitsakh@icloud.com>
 Date: Mon, 13 May 2019 15:48:36 -0700
-Subject: Disable custom libcxx on windows
+Subject: disable_custom_libcxx_on_windows.patch


 diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -5,10 +5,10 @@ Subject: disable_hidden.patch


 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index f9d900c686f6e265c029d281ab04bc37c803fcc5..4e115c09f034cfb6913c97c719b855126ab78624 100644
+index 3925586d55cb79a26b231781a821c510dfe17bd4..1ccff96eccde8dbff2b972d53c05486fb160c5db 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -676,6 +676,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -675,6 +675,9 @@ void RenderWidgetHostImpl::WasHidden() {
   if (is_hidden_)
     return;
 
@@ -19,7 +19,7 @@ index f9d900c686f6e265c029d281ab04bc37c803fcc5..4e115c09f034cfb6913c97c719b85512
 
   TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index e81662ef6b24eb03656a6f1b11b619906edda505..de56061588bb5a26b3ced56a56f56e56900fe10d 100644
+index ef6276238004ff6e12de90d03be1f720c1ac266c..b8d981a45edb22a60cc439e881a4bc81854b35cd 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -183,6 +183,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
--- a/patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
+++ b/patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
@@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
 See https://github.com/electron/electron/issues/10754

 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index b6d4e4d4f642e5043f07bd48435b8c22c52c3a75..b83f0fc7c90f64cc4ce5fce99f2741d736d7ddb7 100644
+index 88883a942c20494c9ee406da09e223ddce6307c4..27468bd09b573f6a7ca8edf86cbc5f272689376e 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4090,7 +4090,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
+@@ -4117,7 +4117,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
         "frame that never had a user gesture since its load. "
         "https://www.chromestatus.com/feature/5082396709879808";
     Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);
--- a/patches/chromium/dom_storage_limits.patch
+++ b/patches/chromium/dom_storage_limits.patch
@@ -31,23 +31,6 @@ With that in mind, an acceptable alternative to disabling the limit at compile-t
 for a given `BrowserWindow` via a `webPreferences` option,
 similar to [`nodeIntegration`](https://electronjs.org/docs/tutorial/security#2-disable-nodejs-integration-for-remote-content).

-diff --git a/content/common/dom_storage/dom_storage_map.cc b/content/common/dom_storage/dom_storage_map.cc
-index fd088fb170bead6452ded14016f21f0c29659e03..b90b6cf9132d16bc3b2076c3fa313916e2b5ea7d 100644
--- a/content/common/dom_storage/dom_storage_map.cc
-+++ b/content/common/dom_storage/dom_storage_map.cc
-@@ -185,10 +185,12 @@ bool DOMStorageMap::SetItemInternal(MapType* map_type,
-   size_t new_item_size = size_in_storage(key, value);
-   size_t new_storage_used = storage_used_ - old_item_size + new_item_size;
- 
-+#if 0
-   // Only check quota if the size is increasing, this allows
-   // shrinking changes to pre-existing files that are over budget.
-   if (new_item_size > old_item_size && new_storage_used > quota_)
-     return false;
-+#endif
- 
-   (*map_type)[key] = value;
-   ResetKeyIterator();
 diff --git a/content/common/dom_storage/dom_storage_types.h b/content/common/dom_storage/dom_storage_types.h
 index e87afe5b8ee07f7038a7cc9c40832b6cd27884da..61c9a0dfff60f79c7b36ff5c7d741c06dca03ada 100644
 --- a/content/common/dom_storage/dom_storage_types.h
@@ -61,7 +44,7 @@ index e87afe5b8ee07f7038a7cc9c40832b6cd27884da..61c9a0dfff60f79c7b36ff5c7d741c06
 
 // In the browser process we allow some overage to
 diff --git a/third_party/blink/renderer/modules/storage/cached_storage_area.cc b/third_party/blink/renderer/modules/storage/cached_storage_area.cc
-index 4b976b74490234cd9ad5ac7a0a63708b6edbbae3..183ed46369dc0f0026c53521d19209011d2d0eea 100644
+index d91fdc2a7d52307126bc04d44167edadb8c743a8..630acfca527aaec44742d45e47ce29d7754e3385 100644
 --- a/third_party/blink/renderer/modules/storage/cached_storage_area.cc
 +++ b/third_party/blink/renderer/modules/storage/cached_storage_area.cc
@@ -107,11 +107,13 @@ bool CachedStorageArea::SetItem(const String& key,
--- a/patches/chromium/dump_syms.patch
+++ b/patches/chromium/dump_syms.patch
@@ -8,7 +8,7 @@ this but it is not a blocker for releasing Electron.  This patch removes
 the hard fail on dylib resolve failure from dump_syms

 diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
-index 937548cc0303d67402f42a6910cfc57bf0e53d64..dce68b1bd1ef58a5dfddb2bbdb56930ed943ad1d 100755
+index cdd374c33a3edc12db9c9496a4ca765d2ba0ab5d..db04d39f8d263dc2b3b67b7f84470f557b519cfa 100755
 --- a/components/crash/content/tools/generate_breakpad_symbols.py
 +++ b/components/crash/content/tools/generate_breakpad_symbols.py
@@ -175,7 +175,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path):
--- a/patches/chromium/exclude-a-few-test-files-from-build.patch
+++ b/patches/chromium/exclude-a-few-test-files-from-build.patch
@@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68.
 Remove the patch during the Chromium 69 upgrade.

 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
-index f985824f021e14c7bb6a0996afd796bc53820f86..4c7c61676602a825cc604324779fa7c51f7f0826 100644
+index 4575cc246a5306f3fc245a0d296b81a4c0f5ae32..af8723a635530df4f14c13461feb737dcd1e7a54 100644
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1722,7 +1722,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
+@@ -1726,7 +1726,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
     "graphics/paint/drawing_display_item_test.cc",
     "graphics/paint/drawing_recorder_test.cc",
     "graphics/paint/float_clip_rect_test.cc",
--- a/patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_offscreen_rendering_with_viz_compositor.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Heilig Benedek <benecene@gmail.com>
 Date: Wed, 20 Mar 2019 20:30:44 +0100
-Subject: feat: offscreen rendering with viz compositor
+Subject: feat_offscreen_rendering_with_viz_compositor.patch


 diff --git a/components/viz/host/host_display_client.cc b/components/viz/host/host_display_client.cc
--- a/patches/chromium/fix_breakpad_symbol_generation_on_linux_arm.patch
+++ b/patches/chromium/fix_breakpad_symbol_generation_on_linux_arm.patch
@@ -1,13 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shelley Vohr <shelley.vohr@gmail.com>
 Date: Tue, 28 May 2019 18:12:17 -0700
-Subject: fix: breakpad symbol generation on linux arm
+Subject: fix_breakpad_symbol_generation_on_linux_arm.patch

 Fixes broken Linux ARM breakpad symbol generation by patching
 out an `ldd`-related call that was throwing.

 diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
-index 4249d7b26f9037b60a40e073f56037f9ff036138..0ad9ff9b9bc7dd535655b37013270ad504aa6a34 100755
+index edb3fa5c125fae7858a1f36495410baf47d58484..05a1385e13d282a63975143cbc6e157984bbd992 100755
 --- a/components/crash/content/tools/generate_breakpad_symbols.py
 +++ b/components/crash/content/tools/generate_breakpad_symbols.py
@@ -67,7 +67,8 @@ def GetSharedLibraryDependenciesLinux(binary, options):
--- a/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch
+++ b/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch
@@ -1,8 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <sattard@slack-corp.com>
 Date: Mon, 4 Mar 2019 14:43:36 -0800
-Subject: fix: disable usage of abort_report_np in MAS builds
+Subject: fix_disable_usage_of_abort_report_np_in_mas_builds.patch

+Disable usage of abort_report_np in MAS builds.

 diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
 index 4eebcea13d17093a685cc79b8a8f61fb3894c71b..d704dced154f1d5db097e566a9c681438f94475d 100644
--- a/patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
+++ b/patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
@@ -1,26 +1,26 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <sattard@slack-corp.com>
 Date: Mon, 4 Mar 2019 14:46:48 -0800
-Subject: fix: disable usage of pthread_fchdir_np and pthread_chdir_np in MAS
- builds
+Subject: 
+ fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_MAS.patch
+
+Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.

 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index c6d5cbbd5417a1b18a6cf94a681de6c671089e35..92d683619e8de505d5172a8ae09e6e67f28da96f 100644
+index 1119fb3f97b1..b0efe96063b9 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
-@@ -25,10 +25,12 @@
+@@ -26,8 +26,10 @@ extern "C" {
 // descriptor. libpthread only exposes a syscall wrapper starting in
 // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
 // the syscall is issued directly.
 +#if !defined(MAS_BUILD)
- extern "C" {
- int pthread_chdir_np(const char*) API_AVAILABLE(macosx(10.12));
+ int pthread_chdir_np(const char* dir) API_AVAILABLE(macosx(10.12));
 int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12));
- }
 +#endif
 
- namespace base {
- 
+ int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
+     API_AVAILABLE(macosx(10.14));
@@ -95,21 +97,29 @@ class PosixSpawnFileActions {
 };
 
@@ -51,3 +51,17 @@ index c6d5cbbd5417a1b18a6cf94a681de6c671089e35..92d683619e8de505d5172a8ae09e6e67
 }
 
 struct GetAppOutputOptions {
+@@ -238,11 +238,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+     file_actions.Inherit(STDERR_FILENO);
+   }
+ 
+#if 0
+   if (options.disclaim_responsibility) {
+     if (__builtin_available(macOS 10.14, *)) {
+       DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
+     }
+   }
+#endif
+ 
+   std::vector<char*> argv_cstr;
+   argv_cstr.reserve(argv.size() + 1);
--- a/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
+++ b/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
@@ -1,8 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <sattard@slack-corp.com>
 Date: Mon, 4 Mar 2019 14:51:45 -0800
-Subject: fix: disable usage of SetApplicationIsDaemon and
- _LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds
+Subject: fix_disable_usage_of_setapplicationisdaemon_and.patch
+
+Disable usage of SetApplicationIsDaemon and
+_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds

 diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
 index 9b0759ab820ddb0e2a9e609b88bbc1673607c4e3..2392fd01736550f404304df324da9d81dfb3d446 100644
--- a/patches/chromium/fix_vc_incompatible_inline_calls.patch
+++ b/patches/chromium/fix_vc_incompatible_inline_calls.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Wed, 14 Aug 2019 15:36:05 -0700
-Subject: fix: vc++ incompatible inline calls
-
-Using const container elements like
-const std::vector<const std::string> a = {"a"};
-will fail when building without libc++ on: 'The C++ Standard
-forbids containers of const elements because
-allocator<const T> is ill-formed."
-
-This fixes the issue by changing the container elements to non-const.
-
-diff --git a/chrome/test/chromedriver/webauthn_commands.cc b/chrome/test/chromedriver/webauthn_commands.cc
-index b0d4d62bc5003682523382600f8f6c815fdf089c..1f36721b50dc9a5e5fe85e044fc921bb1d0c6666 100644
--- a/chrome/test/chromedriver/webauthn_commands.cc
-+++ b/chrome/test/chromedriver/webauthn_commands.cc
-@@ -36,7 +36,7 @@ base::DictionaryValue MapParams(
- // Converts the string |keys| in |params| from base64url to base64. Returns a
- // status error if conversion of one of the keys failed.
- Status ConvertBase64UrlToBase64(base::Value* params,
-                                const std::vector<const std::string> keys) {
-+                                const std::vector<std::string> keys) {
-   for (const std::string key : keys) {
-     base::Value* maybe_value = params->FindKey(key);
-     if (!maybe_value)
-@@ -60,7 +60,7 @@ Status ConvertBase64UrlToBase64(base::Value* params,
- 
- // Converts the string |keys| in |params| from base64 to base64url.
- void ConvertBase64ToBase64Url(base::Value* params,
-                              const std::vector<const std::string> keys) {
-+                              const std::vector<std::string> keys) {
-   for (const std::string key : keys) {
-     std::string* maybe_value = params->FindStringKey(key);
-     if (!maybe_value)
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -186,7 +186,7 @@ index 1edb9fd6b0c383f291735dd1a952fcb7b17cc87f..23967f040eb346be265faa2a92562e1f
   size_t GetRelatedActiveContentsCount() override;
   bool RequiresDedicatedProcess() override;
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 4d4710e8c5382ac9391bb693dc1fd42258efd181..45cf6657ea2055c45ff14669a0e09efc84efd133 100644
+index 15081967b0a29316ab82746ca6fe7d188a9efc58..2f894fdcc72f9e31e62f660e2eaff686b0bde95a 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
@@ -44,6 +44,21 @@
@@ -212,10 +212,10 @@ index 4d4710e8c5382ac9391bb693dc1fd42258efd181..45cf6657ea2055c45ff14669a0e09efc
     const MainFunctionParams& parameters) {
   return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 897c2c1435a8c1a495aa84c928c360d74218bfa7..8b2b21f2ca7306751e123ed31198a2c5c38a4b5c 100644
+index 678b25401338a624dc37a11c45331d65082934e9..bed09d49f1f8ca3a14a5306144faf4ae4d1f7de9 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -204,8 +204,45 @@ struct WebPreferences;
+@@ -205,8 +205,45 @@ struct WebPreferences;
 // the observer interfaces.)
 class CONTENT_EXPORT ContentBrowserClient {
  public:
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -38,7 +38,7 @@ index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a7e81072194c00baa0aa3159a6bfe374
 // is concerned.
 @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index 241f5a41afce70835e12b16fb64192663b0d8580..5e026cb0627970620f5994dc783e1fa989401ed3 100644
+index eb17b696e5c299acda8c48d5f962df8bd7742632..7cdfe8e899ea84edd0f2a87ec3ad9fc150834055 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -219,6 +219,7 @@
@@ -159,7 +159,7 @@ index 241f5a41afce70835e12b16fb64192663b0d8580..5e026cb0627970620f5994dc783e1fa9
     BrowserAccessibilityPositionInstance position =
         CreatePositionFromTextMarker(parameter);
     if (!position->IsNullPosition())
-@@ -2855,6 +2870,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2854,6 +2869,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
 
     return CreateTextMarker(root->CreatePositionAt(index));
   }
@@ -167,7 +167,7 @@ index 241f5a41afce70835e12b16fb64192663b0d8580..5e026cb0627970620f5994dc783e1fa9
 
   if ([attribute isEqualToString:
                      NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -2888,6 +2904,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2887,6 +2903,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     return nil;
   }
 
@@ -175,7 +175,7 @@ index 241f5a41afce70835e12b16fb64192663b0d8580..5e026cb0627970620f5994dc783e1fa9
   if ([attribute
           isEqualToString:
               NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-@@ -2968,6 +2985,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
+@@ -2967,6 +2984,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
 
     return @(child->GetIndexInParent());
   }
@@ -184,7 +184,7 @@ index 241f5a41afce70835e12b16fb64192663b0d8580..5e026cb0627970620f5994dc783e1fa9
   return nil;
 }
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index 790b79d9f67fae56ae1b30307f72a4022f35c854..ba99f5d222735cec8be17426e3ac3553ae656f77 100644
+index 851da832bd30e05974317601712f309b2d542ab6..dd6d4c50468ec5f3364213e43b9336f13b153a19 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -493,6 +493,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -236,7 +236,7 @@ index e59ac93d0e1554a2df5d8c74db2beba25d090228..6657c48664bdec4964b382f80309d1bf
 
 }  // namespace
 diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
-index b6bea74d9f9c2fcfba381477895e4c15741318fc..4a02e5659e85c507d480d7fb9b63ee10bad1fe85 100644
+index 8e4a469b6f0675dc7b82543d5758f0c2ec226809..2fcfb6edb5f57bd25756257b77361d25768f9abf 100644
 --- a/device/bluetooth/bluetooth_adapter_mac.mm
 +++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -36,6 +36,7 @@
@@ -310,10 +310,10 @@ index 7ec6dab821b542cb0096e7f8875ba21703463087..3e26c9dd0a296b8d9c99ca1ee9d9faba
 }
 
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index ee2d5721425c86124de6396b77a564d55e89a212..954812b9dda506b16483c37e9ed938716aa560d1 100644
+index 2e0f06b0c1e4b1670bfe8145b3c5abb178b47d62..2f9483283a789a69d7e85536620daa2e35ee9155 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
-@@ -244,6 +244,7 @@ class DnsConfigServicePosix::Watcher {
+@@ -246,6 +246,7 @@ class DnsConfigServicePosix::Watcher {
 
   bool Watch() {
     bool success = true;
@@ -321,7 +321,7 @@ index ee2d5721425c86124de6396b77a564d55e89a212..954812b9dda506b16483c37e9ed93871
     if (!config_watcher_.Watch(base::Bind(&Watcher::OnConfigChanged,
                                           base::Unretained(this)))) {
       LOG(ERROR) << "DNS config watch failed to start.";
-@@ -265,6 +266,7 @@ class DnsConfigServicePosix::Watcher {
+@@ -267,6 +268,7 @@ class DnsConfigServicePosix::Watcher {
                                 DNS_CONFIG_WATCH_MAX);
     }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Wed, 8 May 2019 17:25:55 -0700
-Subject: network service: allow remote certificate verification logic
+Subject: network_service_allow_remote_certificate_verification_logic.patch


 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 05f062d5d98195571aca579f4451f25ff6da15bf..9c8bd7affcf4e2017c0f661e22155825398b50c7 100644
+index 41e3a4960bfa4909c54b1d3db214fa943bff65b6..781053c8650d98ee39d39e9057159f9a9c923789 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -90,6 +90,11 @@
+@@ -91,6 +91,11 @@
 #include "services/network/url_loader.h"
 #include "services/network/url_request_context_builder_mojo.h"
 
@@ -20,7 +20,7 @@ index 05f062d5d98195571aca579f4451f25ff6da15bf..9c8bd7affcf4e2017c0f661e22155825
 #if BUILDFLAG(IS_CT_SUPPORTED)
 #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
 #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -318,6 +323,75 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) {
+@@ -319,6 +324,75 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) {
 
 }  // namespace
 
@@ -96,7 +96,7 @@ index 05f062d5d98195571aca579f4451f25ff6da15bf..9c8bd7affcf4e2017c0f661e22155825
 constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
 constexpr bool NetworkContext::enable_resource_scheduler_;
 
-@@ -645,6 +719,12 @@ void NetworkContext::SetClient(mojom::NetworkContextClientPtr client) {
+@@ -650,6 +724,12 @@ void NetworkContext::SetClient(mojom::NetworkContextClientPtr client) {
   client_ = std::move(client);
 }
 
@@ -109,7 +109,7 @@ index 05f062d5d98195571aca579f4451f25ff6da15bf..9c8bd7affcf4e2017c0f661e22155825
 void NetworkContext::CreateURLLoaderFactory(
     mojom::URLLoaderFactoryRequest request,
     mojom::URLLoaderFactoryParamsPtr params) {
-@@ -1720,12 +1800,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
+@@ -1727,12 +1807,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
                   cert_net_fetcher_, /*system_trust_store_provider=*/nullptr)));
     }
 #endif
@@ -134,7 +134,7 @@ index 05f062d5d98195571aca579f4451f25ff6da15bf..9c8bd7affcf4e2017c0f661e22155825
   std::unique_ptr<net::NetworkDelegate> network_delegate =
       std::make_unique<NetworkServiceNetworkDelegate>(this);
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index bae29f0850644a63668fb9a5a99b619239635af1..cffd9a9869beb6fa5ab258cc063ecb9233fc90f5 100644
+index 12806873427b070beed2ec3a2a02c58791aa126d..b64485726b76b5a2939a33b9dd3a193d4fff8f6d 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
@@ -80,6 +80,7 @@ class DomainReliabilityMonitor;
@@ -153,7 +153,7 @@ index bae29f0850644a63668fb9a5a99b619239635af1..cffd9a9869beb6fa5ab258cc063ecb92
   void CreateURLLoaderFactory(mojom::URLLoaderFactoryRequest request,
                               mojom::URLLoaderFactoryParamsPtr params) override;
   void ResetURLLoaderFactories() override;
-@@ -553,6 +555,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -556,6 +558,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
   std::unique_ptr<network::NSSTempCertsCacheChromeOS> nss_temp_certs_cache_;
 #endif
 
@@ -163,10 +163,10 @@ index bae29f0850644a63668fb9a5a99b619239635af1..cffd9a9869beb6fa5ab258cc063ecb92
   // CertNetFetcher is not used by the current platform.
   scoped_refptr<net::CertNetFetcherImpl> cert_net_fetcher_;
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 39e583e4481af613f0af97c7a06a0a43f1dd1cfc..bdf12bbbdd7ea7d9dd041f460f79d4ed20062e13 100644
+index 59c05e850bba0c30871fb40f898e9f0b9ce7af36..cd617733773b81aa2e57176c46f392a6a124b7c9 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -161,6 +161,17 @@ interface TrustedURLLoaderHeaderClient {
+@@ -162,6 +162,17 @@ interface TrustedURLLoaderHeaderClient {
   OnLoaderCreated(int32 request_id, TrustedHeaderClient& header_client);
 };
 
@@ -184,7 +184,7 @@ index 39e583e4481af613f0af97c7a06a0a43f1dd1cfc..bdf12bbbdd7ea7d9dd041f460f79d4ed
 // Parameters for constructing a network context.
 struct NetworkContextParams {
   // Name used by memory tools to identify the context.
-@@ -576,6 +587,9 @@ interface NetworkContext {
+@@ -587,6 +598,9 @@ interface NetworkContext {
   // Sets a client for this network context.
   SetClient(NetworkContextClient client);
 
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -1,9 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <jeremya@chromium.org>
 Date: Fri, 5 Oct 2018 14:22:06 -0700
-Subject: pass RenderProcessHost through to PlatformNotificationService
+Subject: notification_provenance.patch

-this is so Electron can identify which renderer a notification came from
+Pass RenderProcessHost through to PlatformNotificationService
+so Electron can identify which renderer a notification came from.

 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
 index a717d9f3539dc0fe86b743c6e29e4311b8b5cec3..1351217319c57be414e6c66f8a01f71fe46d2c04 100644
@@ -107,10 +108,10 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59
       mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 
 diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
-index 95bed38ac589bd55550704d16fa817610aead6f9..664b7dca4e9c2a09680855e9bc3864c8bd8ac4d5 100644
+index 63e8a6a260c0a63d4eee365330352b3112878384..2d20c32e631bc7edf51f02d7d10e8fbbf1516f90 100644
 --- a/content/browser/renderer_interface_binders.cc
 +++ b/content/browser/renderer_interface_binders.cc
-@@ -201,7 +201,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
+@@ -200,7 +200,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
          RenderProcessHost* host, const url::Origin& origin) {
         static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
             ->GetPlatformNotificationContext()
@@ -118,7 +119,7 @@ index 95bed38ac589bd55550704d16fa817610aead6f9..664b7dca4e9c2a09680855e9bc3864c8
 +            ->CreateService(host, origin, std::move(request));
       }));
   parameterized_binder_registry_.AddInterface(
-       base::BindRepeating(&BackgroundFetchServiceImpl::CreateForWorker));
+       base::BindRepeating(&QuotaDispatcherHost::CreateForWorker));
 diff --git a/content/public/browser/platform_notification_service.h b/content/public/browser/platform_notification_service.h
 index ca61088079c4150fcf389504ddcf26bcf6bf69cd..d9c034c39890eef1fe3d95c6d7c0ae68eb711a89 100644
 --- a/content/public/browser/platform_notification_service.h
--- a/patches/chromium/out_of_process_instance.patch
+++ b/patches/chromium/out_of_process_instance.patch
@@ -5,10 +5,10 @@ Subject: out_of_process_instance.patch


 diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
-index d4dc099ca7f49d9541b2891f0efdf069d3cebf19..dab9401485cca4f1d58ad4d511e5ce697890a625 100644
+index 9c77f6422edbb42da34abb4320e0d5103cca5eea..8419b1ce6ed543b150c31d41dc8575e98c203427 100644
 --- a/pdf/out_of_process_instance.cc
 +++ b/pdf/out_of_process_instance.cc
-@@ -466,7 +466,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
+@@ -477,7 +477,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
   std::string document_url = document_url_var.AsString();
   base::StringPiece document_url_piece(document_url);
   is_print_preview_ = IsPrintPreviewUrl(document_url_piece);
--- a/patches/chromium/patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
+++ b/patches/chromium/patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
@@ -1,8 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Fri, 12 Apr 2019 12:47:57 -0700
-Subject: patch the ensure_gn_version.py script to work on mac CI
+Subject: patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch

+This patches the ensure_gn_version_py script to work on macOS CI.
 This script is temporary until https://crbug.com/944667 is resolved. We need to
 patch it because on mac CI, we check out the source code on Linux, which
 confuses the script.
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -0,0 +1,110 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Heilig Benedek <benecene@gmail.com>
+Date: Sat, 10 Aug 2019 00:41:50 +0200
+Subject: feat: enable picture in picture mode for video players
+
+
+diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+index 8e4deafa1746eeb48802a0503fefb37bedb33d04..127c62efd2327e1f3f09e9b93a0b8344e2714f80 100644
+--- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
+@@ -4,7 +4,7 @@
+
+ #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
+
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/gfx/color_palette.h"
+diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
+index 0aca25164dcad26cc000e289d6eb9010e336e6fc..70114b5aa865b96d3ace898d1faf515b9098abd9 100644
+--- a/chrome/browser/ui/views/overlay/close_image_button.cc
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
+@@ -4,7 +4,7 @@
+
+ #include "chrome/browser/ui/views/overlay/close_image_button.h"
+
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/gfx/color_palette.h"
+diff --git a/chrome/browser/ui/views/overlay/mute_image_button.cc b/chrome/browser/ui/views/overlay/mute_image_button.cc
+index 8c88ef08dd5165c0429dd90e8a76b711ac15a4df..ebdb06a6391b8108fa51796a4ad5f3a8ca489b60 100644
+--- a/chrome/browser/ui/views/overlay/mute_image_button.cc
+++ b/chrome/browser/ui/views/overlay/mute_image_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/mute_image_button.h"
+
+ #include "chrome/app/vector_icons/vector_icons.h"
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/l10n/l10n_util.h"
+diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
+index 780863193ca12ec1295752969dfc47ac06a9ae64..e2947b893cfcdb1beaa27beac80a1885ed011ce4 100644
+--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
+@@ -20,7 +20,7 @@
+ #include "chrome/browser/ui/views/overlay/resize_handle_button.h"
+ #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
+ #include "chrome/browser/ui/views/overlay/track_image_button.h"
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "content/public/browser/picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
+diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
+index d9e5174ed622fb030bc37d32fbb40b132d7c4c23..1bf19c344721e74bb29c11a4c5c762a75e5cd821 100644
+--- a/chrome/browser/ui/views/overlay/playback_image_button.cc
+++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/playback_image_button.h"
+
+ #include "chrome/app/vector_icons/vector_icons.h"
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/l10n/l10n_util.h"
+diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
+index ee6b3612d7bdda591e05e5af338a80167ce6cd53..af093f14f1ef49c6de7228b296c32532203ca568 100644
+--- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
+++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/resize_handle_button.h"
+
+ #include "chrome/app/vector_icons/vector_icons.h"
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/hit_test.h"
+ #include "ui/base/l10n/l10n_util.h"
+diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+index da780c96bb757d7382df5f419e2c0fd644ac72b0..ae520bcf73cf6c39ca428c03975746e20b23c3ee 100644
+--- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
+@@ -4,7 +4,7 @@
+
+ #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
+
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/gfx/color_palette.h"
+ #include "ui/views/background.h"
+diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
+index 8f42277409a216f81d21723eb03045ac54525b0e..f7a15bfde9a43c15b18e8afbd60a0b19960f2c93 100644
+--- a/chrome/browser/ui/views/overlay/track_image_button.cc
+++ b/chrome/browser/ui/views/overlay/track_image_button.cc
+@@ -5,7 +5,7 @@
+ #include "chrome/browser/ui/views/overlay/track_image_button.h"
+
+ #include "chrome/app/vector_icons/vector_icons.h"
+-#include "chrome/grit/generated_resources.h"
+#include "electron/grit/electron_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/l10n/l10n_util.h"
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shelley Vohr <shelley.vohr@gmail.com>
 Date: Fri, 7 Jun 2019 13:59:37 -0700
-Subject: fix: printing
+Subject: printing.patch

 Add changeset that was previously applied to sources in chromium_src. The
 majority of changes originally come from these PRs:
@@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.

 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 72a0c8cd0f1be0f7713c01ce28323619f09fcc20..b78da10cb607f0f7ce0e97a620908b55f0901c0c 100644
+index 13f9d7af3ae796ecec3a9189aa59f4b20171fd7a..9c35b294340cce070a9f428dac6aa587c93ccc6c 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
@@ -21,12 +21,12 @@
@@ -57,11 +57,11 @@ index 72a0c8cd0f1be0f7713c01ce28323619f09fcc20..b78da10cb607f0f7ce0e97a620908b55
 +                    JobEventDetails::USER_INIT_CANCELED, 0,
 +                    base::RetainedRef(document_)));
 +  }
-   std::move(callback).Run(printing_context_->settings(), result);
+   std::move(callback).Run(printing_context_->TakeAndResetSettings(), result);
 }
 
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e807d266e2 100644
+index 97079241f54b876c6863097ab523daed4884f410..628a3892a6f5de1247313b64a00cdae2a8557c57 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -27,10 +27,7 @@
@@ -146,7 +146,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
 }
 
 void PrintViewManagerBase::NavigationStopped() {
-@@ -342,7 +347,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
+@@ -347,7 +352,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
   PrintManager::OnPrintingFailed(cookie);
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -155,7 +155,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
 #endif
 
   ReleasePrinterQuery();
-@@ -440,9 +445,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
+@@ -445,9 +450,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
           content::NotificationService::NoDetails());
       break;
     }
@@ -171,7 +171,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
       NOTREACHED();
       break;
     }
-@@ -537,8 +546,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -542,8 +551,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
   DCHECK(!quit_inner_loop_);
   DCHECK(query);
 
@@ -180,7 +180,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
 
   // We can't print if there is no renderer.
   if (!web_contents()->GetRenderViewHost() ||
-@@ -549,8 +556,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -554,8 +561,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
   DCHECK(!print_job_);
   print_job_ = base::MakeRefCounted<PrintJob>();
   print_job_->Initialize(std::move(query), RenderSourceName(), number_pages_);
@@ -189,7 +189,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
   printing_succeeded_ = false;
   return true;
 }
-@@ -599,6 +604,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -604,6 +609,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
   content::RenderFrameHost* rfh = printing_rfh_;
   printing_rfh_ = nullptr;
 
@@ -203,7 +203,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
   if (!print_job_)
     return;
 
-@@ -608,8 +620,9 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -613,8 +625,9 @@ void PrintViewManagerBase::ReleasePrintJob() {
     rfh->Send(msg.release());
   }
 
@@ -215,7 +215,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
   // Don't close the worker thread.
   print_job_ = nullptr;
 }
-@@ -679,6 +692,9 @@ bool PrintViewManagerBase::PrintNowInternal(
+@@ -684,6 +697,9 @@ bool PrintViewManagerBase::PrintNowInternal(
   // Don't print / print preview interstitials or crashed tabs.
   if (web_contents()->ShowingInterstitialPage() || web_contents()->IsCrashed())
     return false;
@@ -226,7 +226,7 @@ index 046cb140b10187e8c2850d990afc4c7a77283ae4..ada5a3d237cd64127412e4ec775a63e8
 }
 
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index dd12f557535feea98991d6563e6c7e82b58d6498..5fa7cc4d82f55058f33ca05e687b062c45578f62 100644
+index 49d3f53ec30e9c9c86f8399511a7086afa4342e1..ea5791daf2f3941b5da8ecae28f5b3eb661858e2 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
@@ -33,6 +33,8 @@ class PrintJob;
@@ -249,7 +249,7 @@ index dd12f557535feea98991d6563e6c7e82b58d6498..5fa7cc4d82f55058f33ca05e687b062c
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
   // Prints the document in |print_data| with settings specified in
-@@ -196,9 +200,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
+@@ -198,9 +202,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // The current RFH that is printing with a system printing dialog.
   content::RenderFrameHost* printing_rfh_;
 
@@ -266,10 +266,10 @@ index dd12f557535feea98991d6563e6c7e82b58d6498..5fa7cc4d82f55058f33ca05e687b062c
   // This means we are _blocking_ until all the necessary pages have been
   // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
-index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3bae1c84c31 100644
+index 40762a36024bc48dfe5259520161dc203197bfd0..e38aa442df858ce362645230f7642b2eb48262ce 100644
 --- a/chrome/browser/printing/printing_message_filter.cc
 +++ b/chrome/browser/printing/printing_message_filter.cc
-@@ -21,6 +21,7 @@
+@@ -22,6 +22,7 @@
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "components/printing/browser/print_manager_utils.h"
 #include "components/printing/common/print_messages.h"
@@ -277,7 +277,7 @@ index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3ba
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-@@ -89,20 +90,23 @@ void PrintingMessageFilter::SetDelegateForTesting(TestDelegate* delegate) {
+@@ -90,20 +91,23 @@ void PrintingMessageFilter::SetDelegateForTesting(TestDelegate* delegate) {
   g_test_delegate = delegate;
 }
 
@@ -304,7 +304,7 @@ index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3ba
 }
 
 PrintingMessageFilter::~PrintingMessageFilter() {
-@@ -137,11 +141,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
+@@ -138,11 +142,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
 
 void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -318,7 +318,7 @@ index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3ba
   std::unique_ptr<PrinterQuery> printer_query = queue_->PopPrinterQuery(0);
   if (!printer_query) {
     printer_query =
-@@ -227,11 +233,13 @@ void PrintingMessageFilter::OnScriptedPrintReply(
+@@ -228,11 +234,13 @@ void PrintingMessageFilter::OnScriptedPrintReply(
 void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
                                                   base::Value job_settings,
                                                   IPC::Message* reply_msg) {
@@ -332,7 +332,7 @@ index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3ba
   std::unique_ptr<PrinterQuery> printer_query =
       queue_->PopPrinterQuery(document_cookie);
   if (!printer_query) {
-@@ -257,7 +265,9 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
+@@ -258,7 +266,9 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
     std::unique_ptr<PrinterQuery> printer_query,
     IPC::Message* reply_msg) {
   PrintMsg_PrintPages_Params params;
@@ -343,7 +343,7 @@ index 355324f069bcccead875cc591c20e456d20a6f5b..fe889df2a0acf271b667813ef430a3ba
     params.Reset();
   } else {
     RenderParamsFromPrintSettings(printer_query->settings(), &params.params);
-@@ -295,7 +305,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
+@@ -296,7 +306,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
                                              bool* cancel) {
@@ -378,7 +378,7 @@ index 9fbea6d0a2dbe55b1d600fbc217dee5aa8ae8cd5..de9bd267e408c02fd4da7d903523c0e6
   // content::BrowserMessageFilter:
   bool OnMessageReceived(const IPC::Message& message) override;
 diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h
-index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..331ac71d925c056d3b7577123251514c35f30fde 100644
+index a134a000bd3ccb229a26b3e2cb3425f91a85618e..fd768d372ac15be9b0553fd7d98ce5e27ed19f5a 100644
 --- a/components/printing/common/print_messages.h
 +++ b/components/printing/common/print_messages.h
@@ -368,7 +368,9 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu)
@@ -393,7 +393,7 @@ index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..331ac71d925c056d3b7577123251514c
 // Like PrintMsg_PrintPages, but using the print preview document's frame/node.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 1a65567cb5c5f98b60d05679700c5eb91d49a229..612766fe63166b047e4f0385f219f6615023fcb6 100644
+index a7780f1beabca9d7335333357fe7cf9f1fcb0d3c..8351ed13f30372dc5e0dcd5b39d9a6947384f8e4 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -37,6 +37,7 @@
@@ -498,7 +498,7 @@ index 1a65567cb5c5f98b60d05679700c5eb91d49a229..612766fe63166b047e4f0385f219f661
     // Check if |this| is still valid.
     if (!self)
       return;
-@@ -1868,10 +1882,23 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
+@@ -1870,10 +1884,23 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
   return printed_pages;
 }
 
@@ -525,7 +525,7 @@ index 1a65567cb5c5f98b60d05679700c5eb91d49a229..612766fe63166b047e4f0385f219f661
   // Check if the printer returned any settings, if the settings is empty, we
   // can safely assume there are no printer drivers configured. So we safely
   // terminate.
-@@ -1891,12 +1918,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
+@@ -1893,12 +1920,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
   return result;
 }
 
@@ -605,23 +605,23 @@ index 17c363ff9aa2e2262cacd0c9baea3820334bf67b..5b02461c2e9afe254405ddacd904e4bd
   settings->set_color(static_cast<ColorModel>(color.value()));
   settings->set_scale_factor(static_cast<double>(scale_factor.value()) / 100.0);
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 78e3c3b2e1bea0f3626838eab14267847a556470..b1c16e6eb1d0d9c0a8b700d9faf408d602f962ea 100644
+index cd5c27c87df175676504a06b4e1904f6b836dc90..c4f6acf66bc69f1e7db633aa5b3b03a913ffb666 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -77,8 +77,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() {
+@@ -93,8 +93,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() {
 
 PrintingContext::Result PrintingContext::UpdatePrintSettings(
     base::Value job_settings) {
 -  ResetSettings();
 -
-   if (!PrintSettingsFromJobSettings(job_settings, &settings_)) {
+   if (!PrintSettingsFromJobSettings(job_settings, settings_.get())) {
     NOTREACHED();
     return OnError();
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 9ccc1a6680bcedd452cade7f7531924ace7876cf..4e1c330c01a1d6d1ba702337f16d8f8a70cd76f5 100644
+index 6a5a7c90ef5b..a033c58076ff 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
-@@ -129,12 +129,12 @@ class PRINTING_EXPORT PrintingContext {
+@@ -131,12 +131,12 @@ class PRINTING_EXPORT PrintingContext {
 
   int job_id() const { return job_id_; }
 
--- a/patches/chromium/put_back_deleted_colors_for_autofill.patch
+++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch
@@ -1,17 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: John Kleinschmidt <jkleinsc@github.com>
 Date: Thu, 20 Jun 2019 16:49:25 -0400
-Subject: put back deleted colors for autofill
+Subject: put_back_deleted_colors_for_autofill.patch

 https://chromium-review.googlesource.com/c/chromium/src/+/1652925 removed colors as they are no longer
 needed in chromium but our autofill implementation uses them.  This patch can be removed if we refactor
-our autofill implementation to work like chromium.
+our autofill implementation to work like Chromium's.

 diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk.cc b/chrome/browser/ui/libgtkui/native_theme_gtk.cc
-index 4edc178d601f764721b8c13b639f6ed073417c43..15c1375b193d71a2ab195d09b22b0969b738395b 100644
+index b77b8a53b0246b05e3c45e74eaf2b5c44c6dad88..7af171f6cd5d76e87e2fca32f5dbcc34d7e0a974 100644
 --- a/chrome/browser/ui/libgtkui/native_theme_gtk.cc
 +++ b/chrome/browser/ui/libgtkui/native_theme_gtk.cc
-@@ -280,6 +280,27 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
+@@ -279,6 +279,27 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
     case ui::NativeTheme::kColorId_TableHeaderSeparator:
       return GetBorderColor("GtkTreeView#treeview.view GtkButton#button");
 
@@ -40,7 +40,7 @@ index 4edc178d601f764721b8c13b639f6ed073417c43..15c1375b193d71a2ab195d09b22b0969
     // TODO(thomasanderson): Render GtkSpinner directly.
     case ui::NativeTheme::kColorId_ThrobberSpinningColor:
 diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
-index 8bd17ec4a9340881694c1aded2c19769d0867edb..bc02c137279dbb672984a59f0a3b546ce5e39012 100644
+index af391345a4c893e3fbde4f750af429a0567188d2..febfb06f18b6f51e6ebcc0c59e2a81b259e97997 100644
 --- a/ui/native_theme/common_theme.cc
 +++ b/ui/native_theme/common_theme.cc
@@ -56,6 +56,14 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
@@ -58,7 +58,7 @@ index 8bd17ec4a9340881694c1aded2c19769d0867edb..bc02c137279dbb672984a59f0a3b546c
       // FocusableBorder
       case NativeTheme::kColorId_FocusedBorderColor:
         return SkColorSetA(gfx::kGoogleBlue300, 0x66);
-@@ -360,6 +368,18 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
+@@ -357,6 +365,18 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
     case NativeTheme::kColorId_UnfocusedBorderColor:
       return SkColorSetA(SK_ColorBLACK, 0x66);
 
@@ -78,10 +78,10 @@ index 8bd17ec4a9340881694c1aded2c19769d0867edb..bc02c137279dbb672984a59f0a3b546c
     case NativeTheme::kColorId_ThrobberSpinningColor:
       return gfx::kGoogleBlue600;
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index d12315d778468333b41308e664d78f0b1ad0391e..8ecad2a7560c124f2a5b412a6d7ed9e60616aa34 100644
+index 3604105e43ee1866a8517c52ed05205b3ed10b56..70389e0245993faa2c17e9deefeb000280ef2368 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -387,6 +387,11 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -389,6 +389,11 @@ class NATIVE_THEME_EXPORT NativeTheme {
     kColorId_TableHeaderText,
     kColorId_TableHeaderBackground,
     kColorId_TableHeaderSeparator,
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -25,7 +25,7 @@ index f41270e262784602c90b79b7aefbcd1a7af43dd8..a28ea7ee72fbf596b2b1d10cacaad406
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 1381c94013e5d9881f131fcab1926698f6b1fe9f..feeb351e2ba929abe82b9a4fe4b5b6982e925156 100644
+index 41288f633262f49ed7fb174c1af4e1834061c940..7fac11ee38f50165a0089473de5be601b1edf040 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -24,9 +24,11 @@
@@ -62,7 +62,7 @@ index 1381c94013e5d9881f131fcab1926698f6b1fe9f..feeb351e2ba929abe82b9a4fe4b5b698
   // This only needs to be overridden by RenderWidgetHostViewBase subclasses
   // that handle content embedded within other RenderWidgetHostViews.
   gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -353,6 +360,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
+@@ -348,6 +355,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
   virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                    const ui::LatencyInfo& latency);
 
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -5,7 +5,7 @@ Subject: render_widget_host_view_mac.patch


 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 5d8727b36c015c5136a3a24c463821ff6ae46994..fa73828627fcea54d12fd6eb6c489248bf2af8d7 100644
+index a9654d8c1a9e15a3f90ec54a0b8e1bc61ce1f803..6c1e802fda70968cbcbea157fc982653de1c70c7 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -152,6 +152,11 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -66,7 +66,7 @@ index 5d8727b36c015c5136a3a24c463821ff6ae46994..fa73828627fcea54d12fd6eb6c489248
   return validAttributesForMarkedText_.get();
 }
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 66edee6f3dd734b86f6c63b037a19937e5b8ca86..d98f25ac7748b82c77e47d318437ae3de4ea6d42 100644
+index f52e0750f337dde0a1f3e7d6d36bac8a62094316..0aac157ae84f975acd6a944c63194bf2ed233188 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -63,6 +63,7 @@
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Electron Bot	1eda92859f	Bump v8.0.0-nightly.20190825	2019-08-25 08:31:03 -07:00
Electron Bot	f54bc1cb2e	Bump v8.0.0-nightly.20190824	2019-08-24 08:31:28 -07:00
Electron Bot	b7d25ccb77	chore: bump chromium to 62327c655093c821aa0fcfc6db53f5fd943e08c7 (master) (#19792 ) * chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch https://chromium-review.googlesource.com/c/chromium/src/+/1600387 * update desktop_media_list.patch https://chromium-review.googlesource.com/c/chromium/src/+/1729156 * update notification_provenance.patch https://chromium-review.googlesource.com/c/chromium/src/+/1742779 * update printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/1646772 * update verbose_generate_bpad_syms.patch https://chromium-review.googlesource.com/c/chromium/src/+/1745986 * update patch metadata * remove printing_compositor manifests https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * update for URLLoaderFactoryType enum https://chromium-review.googlesource.com/c/chromium/src/+/1754716 * remove gin string16 converter https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * ClearCompositorFrame() has been removed https://chromium-review.googlesource.com/c/chromium/src/+/1746301 * message_loop -> message_loop_current https://chromium-review.googlesource.com/c/chromium/src/+/1738552 * include resource_response header * pdf compositor no longer uses service manager https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore https://chromium-review.googlesource.com/c/chromium/src/+/1708767 * fix: make std::hash value-non-const broken by https://chromium-review.googlesource.com/c/chromium/src/+/1711202 * update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback https://chromium-review.googlesource.com/c/chromium/src/+/1753006 * chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to https://chromium-review.googlesource.com/c/chromium/src/+/1678182 and update for https://chromium-review.googlesource.com/c/chromium/src/+/1678182 * convert CookieChangeListener to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1753371 * rename ui::ClipboardType -> ui::ClipboardBuffer https://chromium-review.googlesource.com/c/chromium/src/+/1758730 * logging::LoggingSettings log_file -> log_file_path https://chromium-review.googlesource.com/c/chromium/src/+/1699477 * roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch https://chromium-review.googlesource.com/c/chromium/src/+/1759149 * update printing patch * update cookie usage and fn signatures https://chromium-review.googlesource.com/c/chromium/src/+/1758437 * chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch https://chromium-review.googlesource.com/c/chromium/src/+/1762335 * Convert enum to enum class for FocusManager::FocusChangeReason https://chromium-review.googlesource.com/c/chromium/src/+/1767281 * roll DEPS to latest lkgr * update dom_storage_limits.patch https://chromium-review.googlesource.com/c/chromium/src/+/1767556	2019-08-23 18:14:23 -07:00
Shelley Vohr	c89debd19a	refactor: use Error util when only throwing errors (#19837 )	2019-08-23 15:49:54 -07:00
Charles Kerr	ef6d4a46c2	chore: make apply_all_patches.py work in both python2 and python3 (#19872 )	2019-08-23 15:48:27 -07:00
Milan Burda	81e9dab52f	refactor: replace ipcRendererUtils.invoke() with ipcRendererInternal.invoke() (#19574 )	2019-08-23 15:45:50 -07:00
Shelley Vohr	698120daf0	fix: crash on input file handler dialog (#19897 ) * fix: crash on input file handler dialog * invert cancellation logic	2019-08-23 14:18:30 -07:00
Samuel Attard	c61020e9d3	build: use a lower process count for publish builds with no sccache (#19913 )	2019-08-23 14:01:12 -07:00
Electron Bot	6144408f3a	Bump v8.0.0-nightly.20190823	2019-08-23 08:31:55 -07:00
Milan Burda	7825d043f2	refactor: unify module-list format and exports/electron (#19697 )	2019-08-23 11:18:58 +02:00
Shelley Vohr	c6a8b7f959	docs: clarify dock.bounce usage (#19894 )	2019-08-23 01:16:18 -07:00
Samuel Attard	6a3922d330	refactor: make util::Promise type safe when chaining in native (#19809 ) * refactor: make util::Promise type safe when chaining in native * fixup! refactor: make util::Promise type safe when chaining in native * chore: remove spare brackets	2019-08-22 17:03:28 -07:00
loc	f7e3e1f97a	fix: mitigate white screen flash after occlusion by disabling compositor recycling (#19873 ) * fix: remove white screen flicker by disabling compositor recycling * chore: disable spec whose flakiness was made obvious by this patch	2019-08-22 15:16:06 -07:00
Cheng Zhao	ab0bf6d238	fix: notify views of content view size change (#19878 )	2019-08-22 14:16:56 -07:00
Electron Bot	6667969887	chore: bump node to v12.9.0 (master) (#19863 ) Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>	2019-08-22 14:12:11 -07:00
Jaime Bernardo	12b00ca942	fix: extern Parse impl for Windows debug builds (#19876 ) * fix: extern Parse impl for Windows debug builds Applies a patch to node. Externs node::options_parser::Parse implementation for node::DebugOptions to fix the Windows Debug build. * fixup: merge extern parse impl patch	2019-08-22 13:16:38 -07:00
Robert Nagy	1f43af5cea	feat: add openbsd support in the node module (#19860 )	2019-08-22 12:09:15 -07:00
Electron Bot	268094e0ef	Bump v8.0.0-nightly.20190822	2019-08-22 08:31:04 -07:00
Heilig Benedek	9ccd6aa0dd	feat: enable picture-in-picture mode for video tags (#17686 ) * feat: enable picture in picture mode for video tags * test: add test to verify picture in picture support * lint: fix indent * fix: clean up after rebase * test: update test with 16:9 test video * fix: .paches after rebase	2019-08-22 19:17:50 +09:00
John Kleinschmidt	46b6bcd99b	chore: Update comment for desktop_capturer (#19848 ) * chore: Update comment for desktop_capturer * Guard TopLevelWindow::MoveAbove with ENABLE_DESKTOP_CAPTURER * Fix lint errors	2019-08-21 15:16:43 -07:00
John Kleinschmidt	4bc7b3b1a4	build: start building Windows on Arm builds (#19780 ) * build: add zip manifest for Windows on Arm * ci: add Windows On Arm testing (cherry picked from commit 4064e1f4874ff7a37c52c2ad974f92418c7e71c4) * Fix path to invoke CI on WOA hardware * Explicitly call 7z.exe to unzip files * Make sure GCLIENT_EXTRA_ARGS set for WOA builds get prepended on release build * set proper arch for npm * Try using Compress-Archive/Expand-Archive * Revert "Try using Compress-Archive/Expand-Archive" * disable woa hardware test for now	2019-08-21 17:37:30 -04:00
Shelley Vohr	5e525b3e0f	fix: add default media usage strings to info.plist (#19871 )	2019-08-21 13:14:25 -07:00
Samuel Attard	612e3f7ff7	build: optimize the CI path where we update the patch files (#19851 ) Currently the happy checkout takes 7 minutes and the sad checkout takes 30 minutes. This updates our CI to run checkout twice for every job to make the sad checkout take nearer 10 minutes instead.	2019-08-21 14:52:17 -04:00
Shelley Vohr	991a56135d	build: dynamically calculate out dir (#19857 )	2019-08-21 10:41:35 -07:00
Electron Bot	3bd829aee0	Bump v8.0.0-nightly.20190821	2019-08-21 08:31:24 -07:00
Samuel Attard	674779899e	build: ninja count should be 2*cores + 2 (#19852 )	2019-08-21 10:25:23 -04:00
Heilig Benedek	3f49f984e6	fix: race condition in NodeStreamLoader (#19811 ) * fix: race condition in NodeStreamLoader * nit: add comments	2019-08-21 12:23:46 +09:00
Cheng Zhao	b7defaaf6a	feat: migrate webRequest module to NetworkService (Part 8) (#19841 ) * fix: fill uploadData property * fix: requestHeaders in onBeforeSendHeaders * fix: responseHeaders in onHeadersReceived * fix: header keys should not be lowercased * fix: gin::Dictionary::Get succeeds even though key does not exist... * fix: throw for invalid filters * test: re-enable api-web-request-spec * chore: do not use deprecated base::Value API	2019-08-21 11:14:21 +09:00
Samuel Attard	f10f44acf5	fix: trim branch name before comparing to master (#19853 )	2019-08-20 18:10:44 -07:00
John Kleinschmidt	d258797d05	ci: add macOS debug builds (#19831 ) * ci: add macOS debug builds * Fix mac debug builds	2019-08-20 16:11:29 -04:00
Carlos	fb214a599e	docs: update documentation under tutorials (#19804 )	2019-08-20 09:45:25 -07:00
Electron Bot	a4c0f26f06	Bump v8.0.0-nightly.20190820	2019-08-20 08:32:09 -07:00
Erick Zhao	145b4fae94	feat: implement `will-move` event on macOS (#19641 )	2019-08-20 07:53:43 -07:00
Cheng Zhao	cd1b15a155	feat: migrate webRequest module to NetworkService (Part 7) (#19820 ) * fix: gin treats Function as Dictionary when doing convertions * fix: check if listener exists * fix: listener callback should be executed in next tick * feat: make InProgressRequest work * test: re-enable protocol test that relies on webRequest * chore: merge conditions	2019-08-20 20:46:20 +09:00
Shelley Vohr	1dc02e6dbc	fix: fall back to default logs path in getPath('logs') (#19653 )	2019-08-19 15:16:00 -07:00
pi1024e	0851697cb7	docs: fix punctuation errors in native-image.m (#19620 ) * Added correct punctuation to sentences in documentation as well as changed lets to consts to pass the docs linter * Fixed inconsistent indentation	2019-08-19 15:15:13 -07:00
Electron Bot	bd11be98aa	chore: bump node to v12.8.1 (master) (#19790 ) * chore: bump node in DEPS to v12.8.1 * test: disable parallel/test-http2-reset-flood Disabled new Worker test owing to a threading issue where the Worker segfaults on worker.on('message', () => {}). We've disabled failing worker tests previously as we don't offer first-class support for them in Electron.	2019-08-19 14:15:04 -07:00
Shelley Vohr	a54d438e18	chore: upgrades-wg owns DEPS (#19830 )	2019-08-19 13:56:20 -07:00
Heilig Benedek	b33558d822	refactor: mojofy autofill renderer->browser (#18760 ) * re-implement renderer->browser calls with mojo * lint * fix: clean up after rebase * lint * fix: lazy load autofill drivers	2019-08-19 13:13:24 -07:00
Shelley Vohr	43e6d7fe88	chore: add error throwing utility (#19803 ) * chore: add error throwing utility * feedback from review * DRY out repeated isolate calls	2019-08-19 09:10:18 -07:00