fix: File System Access API should remember last picked directory (#42893 )

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
fix: crash when resolving proxy due to network service restart (#42897 )
2026-02-26 03:01:17 -05:00 · 2024-07-15 17:22:56 +02:00 · 2024-07-15 14:50:41 +02:00 · 2024-07-14 18:30:34 +02:00 · 2024-07-13 12:10:40 -07:00 · 2024-07-12 11:17:39 +02:00
486 changed files with 5901 additions and 6518 deletions
--- a/.autofix.markdownlint-cli2.jsonc
+++ b/.autofix.markdownlint-cli2.jsonc
@@ -1,8 +0,0 @@
-{
-  "config": {
-    "default": false,
-    "no-trailing-spaces": {
-      "br_spaces": 0
-    }
-  }
-}
--- a/.circleci/.gitignore
+++ b/.circleci/.gitignore
@@ -0,0 +1 @@
+config-staging
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,56 @@
+version: 2.1
+
+# Required for dynamic configuration
+setup: true
+
+# Orbs
+orbs:
+  path-filtering: circleci/path-filtering@0.1.0
+  continuation: circleci/continuation@0.2.0
+
+# All input parameters to pass to build config
+parameters:
+  run-docs-only:
+    type: boolean
+    default: false
+
+  upload-to-storage:
+    type: string
+    default: '1'
+
+  run-build-linux:
+    type: boolean
+    default: false
+
+jobs:
+  generate-config:
+    docker:
+      - image: cimg/node:16.14
+    steps:
+      - checkout
+      - path-filtering/set-parameters:
+          base-revision: main
+          mapping: |
+            ^((?!docs/).)*$ run-build-linux true
+            docs/.* run-docs-only true
+            ^((?!docs/).)*$ run-docs-only false
+      - run:
+          command: |
+            cd .circleci/config
+            yarn
+            export CIRCLECI_BINARY="$HOME/circleci"
+            curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | DESTDIR=$CIRCLECI_BINARY bash
+            node build.js
+          name: Pack config.yml
+      - run:
+          name: Set params
+          command: node .circleci/config/params.js
+      - continuation/continue:
+          configuration_path: .circleci/config-staging/built.yml
+          parameters: /tmp/pipeline-parameters.json
+
+# Initial setup workflow
+workflows:
+  setup:
+    jobs:
+      - generate-config
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
--- a/.circleci/config/build.js
+++ b/.circleci/config/build.js
@@ -0,0 +1,34 @@
+const cp = require('child_process');
+const fs = require('fs-extra');
+const path = require('path');
+const yaml = require('js-yaml');
+
+const STAGING_DIR = path.resolve(__dirname, '..', 'config-staging');
+
+function copyAndExpand(dir = './') {
+    const absDir = path.resolve(__dirname, dir);
+    const targetDir = path.resolve(STAGING_DIR, dir);
+
+    if (!fs.existsSync(targetDir)) {
+        fs.mkdirSync(targetDir);
+    }
+
+    for (const file of fs.readdirSync(absDir)) {
+        if (!file.endsWith('.yml')) {
+            if (fs.statSync(path.resolve(absDir, file)).isDirectory()) {
+                copyAndExpand(path.join(dir, file));
+            }
+            continue;
+        }
+
+        fs.writeFileSync(path.resolve(targetDir, file), yaml.dump(yaml.load(fs.readFileSync(path.resolve(absDir, file), 'utf8')), {
+            noRefs: true,
+        }));
+    }
+}
+
+if (fs.pathExists(STAGING_DIR)) fs.removeSync(STAGING_DIR);
+copyAndExpand();
+
+const output = cp.spawnSync(process.env.CIRCLECI_BINARY || 'circleci', ['config', 'pack', STAGING_DIR]);
+fs.writeFileSync(path.resolve(STAGING_DIR, 'built.yml'), output.stdout.toString());
--- a/.circleci/config/jobs/lint.yml
+++ b/.circleci/config/jobs/lint.yml
@@ -0,0 +1,51 @@
+executor:
+  name: linux-docker
+  size: medium
+steps:
+  - checkout:
+      path: src/electron
+  - run:
+      name: Setup third_party Depot Tools
+      command: |
+        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+        echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
+  - run:
+      name: Download GN Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
+
+        cipd ensure -ensure-file - -root . \<<-CIPD
+        \$ServiceURL https://chrome-infra-packages.appspot.com/
+        @Subdir src/buildtools/linux64
+        gn/gn/linux-amd64 $gn_version
+        CIPD
+
+        echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
+  - run:
+      name: Download clang-format Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+
+        sha1_path='buildtools/linux64/clang-format.sha1'
+        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
+
+        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
+  - run:
+      name: Run Lint
+      command: |
+        # gn.py tries to find a gclient root folder starting from the current dir.
+        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+        touch .gclient
+        # Another option would be to checkout "buildtools" inside the Electron checkout,
+        # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+        cd src/electron
+        node script/yarn install --frozen-lockfile
+        node script/yarn lint
+  - run:
+      name: Run Script Typechecker
+      command: |
+        cd src/electron
+        node script/yarn tsc -p tsconfig.script.json
--- a/.circleci/config/package.json
+++ b/.circleci/config/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@electron/circleci-config",
+  "version": "0.0.0",
+  "private": true,
+  "license": "MIT",
+  "dependencies": {
+    "fs-extra": "^10.1.0",
+    "js-yaml": "^4.1.0"
+  }
+}
--- a/.circleci/config/params.js
+++ b/.circleci/config/params.js
@@ -0,0 +1,12 @@
+const fs = require('fs');
+
+const PARAMS_PATH = '/tmp/pipeline-parameters.json';
+
+const content = JSON.parse(fs.readFileSync(PARAMS_PATH, 'utf-8'));
+
+// Choose resource class for linux hosts
+const currentBranch = process.env.CIRCLE_BRANCH || '';
+content['large-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? '2xlarge' : 'electronjs/aks-linux-large';
+content['medium-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? 'medium' : 'electronjs/aks-linux-medium';
+
+fs.writeFileSync(PARAMS_PATH, JSON.stringify(content));
--- a/.circleci/config/yarn.lock
+++ b/.circleci/config/yarn.lock
@@ -0,0 +1,43 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+fs-extra@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
--- a/.circleci/fix-known-hosts.sh
+++ b/.circleci/fix-known-hosts.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p ~/.ssh
+echo "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -36,6 +36,7 @@
 				"dbaeumer.vscode-eslint",
 				"shakram02.bash-beautify",
 				"marshallofsound.gnls-electron",
+				"CircleCI.circleci"
 			],
 			"settings": {
 				"editor.tabSize": 2,
--- a/.env.example
+++ b/.env.example
@@ -2,4 +2,5 @@
 # See docs/development/releasing.md

 APPVEYOR_CLOUD_TOKEN=
+CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,7 +22,6 @@ patches/**/.patches merge=union
 *.md text eol=lf
 *.mm text eol=lf
 *.mojom text eol=lf
-*.patches text eol=lf
 *.proto text eol=lf
 *.py text eol=lf
 *.ps1 text eol=lf
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -36,7 +36,7 @@ runs:
      shell: bash
      if: ${{ inputs.target-arch == 'x64' && inputs.target-platform == 'macos' }}
      run: |
-        GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"x64\" v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
+        GN_APPENDED_ARGS="$GN_EXTRA_ARGS v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
        echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV
    - name: Build Electron ${{ inputs.step-suffix }}
      shell: bash
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -61,8 +61,8 @@ runs:
        echo "cache_exists=false" >> $GITHUB_OUTPUT
        echo "Cache Does Not Exist for $DEPSHASH"
      else
-        echo "cache_exists=true" >> $GITHUB_OUTPUT
-        echo "Cache Already Exists for $DEPSHASH, Skipping.."
+        echo "cache_exists=false" >> $GITHUB_OUTPUT
+        echo "Cache Already Exists for $DEPSHASH, Busting cache.."
      fi
  - name: Gclient Sync
    if: steps.check-cache.outputs.cache_exists == 'false'
@@ -87,7 +87,7 @@ runs:
          # Export it
          mkdir -p ../../patches
          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          if node ./script/push-patch.js; then
+          if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
            echo
            echo "======================================================================"
            echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
@@ -100,8 +100,6 @@ runs:
            echo "There were changes to the patches when applying."
            echo "Check the CI artifacts for a patch you can apply to fix it."
            echo "======================================================================"
-            echo
-            cat ../../patches/update-patches.patch
            exit 1
          fi
        fi
@@ -153,4 +151,4 @@ runs:
        exit 1
      else
        echo "Cache key persisted in $final_cache_path"
-      fi
+      fi
--- a/.github/actions/fix-sync-macos/action.yml
+++ b/.github/actions/fix-sync-macos/action.yml
@@ -46,7 +46,7 @@ runs:
        fi
        python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil

-        echo 'infra/3pp/build_support/ninja-1_11_1/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/build_support/ninja-1_11_1/${platform}'` > ninja_ensure_file
+        echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file
        sed $SEDOPTION "s/Updating depot_tools... //g" ninja_ensure_file
        cipd ensure --root src/third_party/ninja -ensure-file ninja_ensure_file

--- a/.github/actions/install-build-tools/action.yml
+++ b/.github/actions/install-build-tools/action.yml
@@ -6,6 +6,6 @@ runs:
  - name: Install Build Tools
    shell: bash
    run: |
-      export BUILD_TOOLS_SHA=d5b87591842be19058e8d75d2c5b7f1fabe9f450
+      export BUILD_TOOLS_SHA=47d4bb016f47d89938898c794db80b9f98d78ad7
      npm i -g @electron/build-tools
      e auto-update disable
--- a/.github/actions/restore-cache-azcopy/action.yml
+++ b/.github/actions/restore-cache-azcopy/action.yml
@@ -34,9 +34,6 @@ runs:
        fi
        azcopy copy --log-level=ERROR \
          "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
-    env:
-      AZURE_AKS_CACHE_STORAGE_ACCOUNT: f723719aa87a34622b5f7f3
-      AZURE_AKS_CACHE_SHARE_NAME: pvc-f6a4089f-b082-4bee-a3f9-c3e1c0c02d8f
  - name: Clean SAS Key
    shell: bash
    run: rm -f sas-token
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,9 +0,0 @@
-# Keep GitHub Actions up to date with GitHub's Dependabot...
-# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
--- a/.github/workflows/branch-created.yml
+++ b/.github/workflows/branch-created.yml
@@ -92,7 +92,7 @@ jobs:
            }))
      - name: Create Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/copy-project@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/copy-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        id: create-release-board
        with:
          drafts: true
@@ -112,14 +112,14 @@ jobs:
          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
      - name: Find Previous Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/find-project@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/find-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        id: find-prev-release-board
        with:
          title: ${{ steps.generate-project-metadata.outputs.prev-prev-major }}-x-y
          token: ${{ steps.generate-token.outputs.token }}
      - name: Close Previous Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/close-project@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/close-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          project-number: ${{ steps.find-prev-release-board.outputs.number }}
          token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,7 +90,6 @@ jobs:
        - /var/run/sas:/var/run/sas
    env:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-      PATCH_UP_APP_CREDS: ${{ secrets.PATCH_UP_APP_CREDS }}
    outputs:
      build-image-sha: ${{ needs.setup.outputs.build-image-sha }}
    steps:
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -20,7 +20,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
@@ -38,7 +38,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
@@ -70,7 +70,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
      - name: Create comment
        if: ${{ steps.check-for-comment.outputs.SHOULD_COMMENT }}
-        uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3.6.0
+        uses: actions-cool/issues-helper@275328970dbc3bfc3bc43f5fe741bf3638300c0a # v3.3.3
        with:
          actions: 'create-comment'
          token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/issue-opened.yml
+++ b/.github/workflows/issue-opened.yml
@@ -19,7 +19,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Add to Issue Triage
-        uses: dsanders11/project-actions/add-item@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/add-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          field: Reporter
          field-value: ${{ github.event.issue.user.login }}
@@ -35,7 +35,7 @@ jobs:
        with:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
-      - run: npm install mdast-util-from-markdown@2.0.0 unist-util-select@5.1.0 semver@7.6.0
+      - run: npm install mdast-util-from-markdown@2.0.0 unist-util-select@5.1.0
      - name: Add labels
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        env:
@@ -45,7 +45,6 @@ jobs:
          script: |
            const { fromMarkdown } = await import('${{ github.workspace }}/node_modules/mdast-util-from-markdown/index.js');
            const { select } = await import('${{ github.workspace }}/node_modules/unist-util-select/index.js');
-            const semver = await import('${{ github.workspace }}/node_modules/semver/index.js');

            const [ owner, repo ] = '${{ github.repository }}'.split('/');
            const issue_number = ${{ github.event.issue.number }};
@@ -54,28 +53,6 @@ jobs:

            const labels = [];

-            const electronVersion = select('heading:has(> text[value="Electron Version"]) + paragraph > text', tree)?.value.trim();
-            if (electronVersion !== undefined) {
-              const major = semver.parse(electronVersion)?.major;
-              if (major) {
-                const versionLabel = `${major}-x-y`;
-                let labelExists = false;
-
-                try {
-                  await github.rest.issues.getLabel({
-                    owner,
-                    repo,
-                    name: versionLabel,
-                  });
-                  labelExists = true;
-                } catch {}
-
-                if (labelExists) {
-                  labels.push(versionLabel);
-                }
-              }
-            }
-
            const gistUrl = select('heading:has(> text[value="Testcase Gist URL"]) + paragraph > text', tree)?.value.trim();
            if (gistUrl !== undefined && gistUrl.startsWith('https://gist.github.com/')) {
              labels.push('has-repro-gist');
--- a/.github/workflows/issue-unlabeled.yml
+++ b/.github/workflows/issue-unlabeled.yml
@@ -30,7 +30,7 @@ jobs:
          org: electron
      - name: Set status
        if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: dsanders11/project-actions/edit-item@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
--- a/.github/workflows/pipeline-electron-lint.yml
+++ b/.github/workflows/pipeline-electron-lint.yml
@@ -32,7 +32,7 @@ jobs:
      shell: bash
      run: |
        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
        echo "$(pwd)/src/third_party/depot_tools" >> $GITHUB_PATH
    - name: Download GN Binary
      shell: bash
@@ -53,10 +53,10 @@ jobs:
      run: |
        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"

-        mkdir -p src/buildtools
-        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/buildtools/DEPS?format=TEXT" | base64 -d > src/buildtools/DEPS
+        sha1_path='buildtools/linux64/clang-format.sha1'
+        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"

-        gclient sync --spec="solutions=[{'name':'src/buildtools','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':True},'managed':False}]"
+        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
    - name: Run Lint
      shell: bash
      run: |
@@ -74,4 +74,4 @@ jobs:
      run: |
        cd src/electron
        node script/yarn tsc -p tsconfig.script.json
-    
+    
--- a/.github/workflows/pipeline-segment-electron-build.yml
+++ b/.github/workflows/pipeline-segment-electron-build.yml
@@ -61,6 +61,8 @@ concurrency:
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}

 env:
+  AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}
+  AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }}
  ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }}
  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
  ELECTRON_GITHUB_TOKEN: ${{ secrets.ELECTRON_GITHUB_TOKEN }}
@@ -114,7 +116,7 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git

        SEDOPTION="-i"
        if [ "`uname`" = "Darwin" ]; then
--- a/.github/workflows/pipeline-segment-electron-gn-check.yml
+++ b/.github/workflows/pipeline-segment-electron-gn-check.yml
@@ -36,6 +36,8 @@ concurrency:
  cancel-in-progress: true

 env:
+  AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}
+  AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }}
  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
  ELECTRON_OUT_DIR: Default
@@ -62,7 +64,7 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git

        SEDOPTION="-i"
        if [ "`uname`" = "Darwin" ]; then
--- a/.github/workflows/pipeline-segment-electron-test.yml
+++ b/.github/workflows/pipeline-segment-electron-test.yml
@@ -103,17 +103,18 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        if [ "`uname`" = "Darwin" ]; then
          # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
-          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./autoninja
+          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
        else
-          sed -i '/ninjalog_uploader_wrapper.py/d' ./autoninja
+          sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
          # Remove swift-format dep from cipd on macOS until we send a patch upstream.
+          cd depot_tools
          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        fi
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
--- a/.github/workflows/pipeline-segment-node-nan-test.yml
+++ b/.github/workflows/pipeline-segment-node-nan-test.yml
@@ -61,11 +61,12 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+        cd depot_tools
+        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        # Ensure depot_tools does not update.
        test -d depot_tools && cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
@@ -124,11 +125,12 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+        cd depot_tools
+        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        # Ensure depot_tools does not update.
        test -d depot_tools && cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
--- a/.github/workflows/pull-request-labeled.yml
+++ b/.github/workflows/pull-request-labeled.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Trigger Slack workflow
-        uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
        with:
          payload: |
            {
@@ -33,7 +33,7 @@ jobs:
          creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 94
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -22,13 +22,13 @@ jobs:

    steps:
      - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          persist-credentials: false

      # This is a pre-submit / pre-release.
      - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
        with:
          results_file: results.sarif
          results_format: sarif
@@ -42,7 +42,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
        with:
          name: SARIF file
          path: results.sarif
@@ -50,6 +50,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
        with:
          sarif_file: results.sarif
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # v5.5.2
+        uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/stable-prep-items.yml
+++ b/.github/workflows/stable-prep-items.yml
@@ -27,7 +27,7 @@ jobs:
          PROJECT_NUMBER=$(gh project list --owner electron --format json | jq -r '.projects | map(select(.title | test("^[0-9]+-x-y$"))) | max_by(.number) | .number')
          echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_OUTPUT"
      - name: Update Completed Stable Prep Items
-        uses: dsanders11/project-actions/completed-by@eb760c48894b5702398529cbb8f6e98378e315d0 # v1.3.0
+        uses: dsanders11/project-actions/completed-by@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          field: Prep Status
          field-value: ✅ Complete
--- a/.github/workflows/update_appveyor_image.yml
+++ b/.github/workflows/update_appveyor_image.yml
@@ -19,7 +19,7 @@ jobs:
      with:
        creds: ${{ secrets.APPVEYOR_UPDATER_GH_APP_CREDS }}
    - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
      with:
        fetch-depth: 0
        token: ${{ steps.generate-token.outputs.token }}
@@ -39,7 +39,7 @@ jobs:
        fi
    - name: (Optionally) Update Appveyor Image
      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: mikefarah/yq@557dcb87b8efe786f89a12c09e9046b4753ab72e # v4.44.1
+      uses: mikefarah/yq@bb66c9c872a7a4cf3d6846c2ff6d182c66ec3f77 # v4.40.7
      with:
        cmd: |
          yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
@@ -60,7 +60,7 @@ jobs:
        git add appveyor-woa.yml
    - name: (Optionally) Commit to Branch
      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: dsanders11/github-app-commit-action@48d2ff8c1a855eb15d16afa97ae12616456d7cbc # v1.4.0
+      uses: dsanders11/github-app-commit-action@1dd0a2d22c564461d3f598b6858856e8842d7a16 # v1.1.0
      with:
        message: 'build: update appveyor image to latest version'
        ref: bump-appveyor-image
--- a/.lint-roller.json
+++ b/.lint-roller.json
@@ -1,13 +0,0 @@
-{
-  "markdown-ts-check": {
-    "defaultImports": [
-      "import * as childProcess from 'node:child_process'",
-      "import * as fs from 'node:fs'",
-      "import * as path from 'node:path'",
-      "import { app, autoUpdater, contextBridge, crashReporter, dialog, BrowserWindow, ipcMain, ipcRenderer, Menu, MessageChannelMain, nativeImage, net, protocol, session, systemPreferences, Tray, utilityProcess, webFrame, webFrameMain } from 'electron'"
-    ],
-    "typings": [
-      "../electron.d.ts"
-    ]
-  }
-}
--- a/.markdownlint-cli2.jsonc
+++ b/.markdownlint-cli2.jsonc
@@ -1,28 +0,0 @@
-{
-  "config": {
-    "extends": "@electron/lint-roller/configs/markdownlint.json",
-    "link-image-style": {
-      "autolink": false,
-      "shortcut": false
-    },
-    "no-angle-brackets": true,
-    "no-curly-braces": true,
-    "no-inline-html": {
-      "allowed_elements": [
-        "br",
-        "details",
-        "img",
-        "li",
-        "summary",
-        "ul",
-        "unknown",
-        "Tabs",
-        "TabItem"
-      ]
-    },
-    "no-newline-in-links": true
-  },
-  "customRules": [
-    "@electron/lint-roller/markdownlint-rules/"
-  ]
-}
--- a/.markdownlint.autofix.json
+++ b/.markdownlint.autofix.json
@@ -0,0 +1,6 @@
+{
+  "default": false,
+  "no-trailing-spaces": {
+    "br_spaces": 0
+  }
+}
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "@electron/lint-roller/configs/markdownlint.json",
+  "no-angle-brackets": true,
+  "no-inline-html": {
+    "allowed_elements": [
+      "br",
+      "details",
+      "img",
+      "li",
+      "summary",
+      "ul",
+      "unknown",
+      "Tabs",
+      "TabItem",
+    ]
+  }
+}
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -34,6 +34,7 @@ import("js2c_toolchain.gni")
 if (is_mac) {
  import("//build/config/mac/rules.gni")
  import("//third_party/icu/config.gni")
+  import("//ui/gl/features.gni")
  import("//v8/gni/v8.gni")
  import("build/rules.gni")

@@ -436,7 +437,6 @@ source_set("electron_lib") {
    "//components/certificate_transparency",
    "//components/compose:buildflags",
    "//components/embedder_support:browser_util",
-    "//components/input:input",
    "//components/language/core/browser",
    "//components/net_log",
    "//components/network_hints/browser",
@@ -465,7 +465,6 @@ source_set("electron_lib") {
    "//gin",
    "//media/capture/mojom:video_capture",
    "//media/mojo/mojom",
-    "//media/mojo/mojom:web_speech_recognition",
    "//net:extras",
    "//net:net_resources",
    "//printing/buildflags",
@@ -811,33 +810,37 @@ if (is_mac) {
    group("electron_framework_libraries") {
    }
  }
+  if (use_egl) {
+    # Add the ANGLE .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_angle_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
+      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:angle_library_copy" ]
+    }

-  # Add the ANGLE .dylibs in the Libraries directory of the Framework.
-  bundle_data("electron_angle_binaries") {
-    sources = [
-      "$root_out_dir/egl_intermediates/libEGL.dylib",
-      "$root_out_dir/egl_intermediates/libGLESv2.dylib",
-    ]
-    outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-    public_deps = [ "//ui/gl:angle_library_copy" ]
+    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_swiftshader_binaries") {
+      sources = [
+        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
+        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
+      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
+    }
  }
-
-  # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
-  bundle_data("electron_swiftshader_binaries") {
-    sources = [
-      "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-      "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
-    ]
-    outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-    public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
-  }
-
  group("electron_angle_library") {
-    deps = [ ":electron_angle_binaries" ]
+    if (use_egl) {
+      deps = [ ":electron_angle_binaries" ]
+    }
  }

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

  bundle_data("electron_crashpad_helper") {
--- a/4
+++ b/4
@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '128.0.6613.18',
+    '126.0.6478.127',
  'node_version':
-    'v20.16.0',
+    'v20.15.0',
  'nan_version':
    'e14bdcd1f72d62bca1d541b66da43130384ec213',
  'squirrel.mac_version':
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)

-[![GitHub Actions Build Status](https://github.com/electron/electron/actions/workflows/build.yml/badge.svg)](https://github.com/electron/electron/actions/workflows/build.yml)
+[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
 [![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.gg/electronjs)

--- a/appveyor-woa.yml
+++ b/appveyor-woa.yml
@@ -29,7 +29,7 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-128.0.6611.0
+image: e-126.0.6445.0
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -282,8 +282,8 @@ for:
                Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
              }
              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              7z x -y -osrc pdb.zip
+              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
+              # 7z x -y -osrc pdb.zip
            }
          }
      - ps: |
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,7 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-128.0.6611.0
+image: e-126.0.6445.0
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -273,8 +273,8 @@ for:
                Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
              }
              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              7z x -y -osrc pdb.zip
+              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
+              # 7z x -y -osrc pdb.zip
            }
          }
      - ps: |
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
-node_module_version = 128
+node_module_version = 125

 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -24,8 +24,11 @@ template("extract_symbols") {
    assert(defined(invoker.binary), "Need binary to dump")
    assert(defined(invoker.symbol_dir), "Need directory for symbol output")

-    dump_syms_label =
-        "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)"
+    if (host_os == "win" && target_cpu == "x86") {
+      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
+    } else {
+      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
+    }
    dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                       "/dump_syms$_host_executable_suffix"

--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -117,8 +117,6 @@ static_library("chrome") {
    "//chrome/browser/ui/views/overlay/constants.h",
    "//chrome/browser/ui/views/overlay/hang_up_button.cc",
    "//chrome/browser/ui/views/overlay/hang_up_button.h",
-    "//chrome/browser/ui/views/overlay/minimize_button.cc",
-    "//chrome/browser/ui/views/overlay/minimize_button.h",
    "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
    "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
    "//chrome/browser/ui/views/overlay/playback_image_button.cc",
@@ -246,7 +244,6 @@ static_library("chrome") {
    ]
    deps += [
      "//chrome/services/util_win/public/mojom",
-      "//components/compose/core/browser:mojo_bindings",
      "//components/segmentation_platform/public/proto",
    ]
  }
--- a/docs/README.md
+++ b/docs/README.md
@@ -98,6 +98,7 @@ These individual tutorials expand on topics discussed in the guide above.

 ### Custom DOM Elements:

+* [`File` Object](api/file-object.md)
 * [`<webview>` Tag](api/webview-tag.md)
 * [`window.open` Function](api/window-open.md)

--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -690,8 +690,6 @@ Sets whether the window should be in fullscreen mode.

 Returns `boolean` - Whether the window is in fullscreen mode.

-**Note:** On macOS, fullscreen transitions take place asynchronously. When querying for a BrowserWindow's fullscreen status, you should ensure that either the ['enter-full-screen'](browser-window.md#event-enter-full-screen) or ['leave-full-screen'](browser-window.md#event-leave-full-screen) events have been emitted.
-
 #### `win.setSimpleFullScreen(flag)` _macOS_

 * `flag` boolean
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -129,7 +129,7 @@ has been included below for completeness:
 | `Object` | Complex | ✅ | ✅ | Keys must be supported using only "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
 | `Array` | Complex | ✅ | ✅ | Same limitations as the `Object` type |
 | `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context, and any custom properties on the Error object [will be lost](https://github.com/electron/electron/issues/25596) |
-| `Promise` | Complex | ✅ | ✅ | N/A |
+| `Promise` | Complex | ✅ | ✅ | N/A
 | `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
 | `Element` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending custom elements will not work. |
--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -9,66 +9,80 @@ The following example shows how to capture video from a desktop window whose
 title is `Electron`:

 ```js
-// main.js
-const { app, BrowserWindow, desktopCapturer, session } = require('electron')
+// In the main process.
+const { BrowserWindow, desktopCapturer } = require('electron')

-app.whenReady().then(() => {
-  const mainWindow = new BrowserWindow()
+const mainWindow = new BrowserWindow()

-  session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
-    desktopCapturer.getSources({ types: ['screen'] }).then((sources) => {
-      // Grant access to the first screen found.
-      callback({ video: sources[0], audio: 'loopback' })
-    })
-  })
-
-  mainWindow.loadFile('index.html')
+desktopCapturer.getSources({ types: ['window', 'screen'] }).then(async sources => {
+  for (const source of sources) {
+    if (source.name === 'Electron') {
+      mainWindow.webContents.send('SET_SOURCE', source.id)
+      return
+    }
+  }
 })
 ```

+```js @ts-nocheck
+// In the preload script.
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('SET_SOURCE', async (event, sourceId) => {
+  try {
+    const stream = await navigator.mediaDevices.getUserMedia({
+      audio: false,
+      video: {
+        mandatory: {
+          chromeMediaSource: 'desktop',
+          chromeMediaSourceId: sourceId,
+          minWidth: 1280,
+          maxWidth: 1280,
+          minHeight: 720,
+          maxHeight: 720
+        }
+      }
+    })
+    handleStream(stream)
+  } catch (e) {
+    handleError(e)
+  }
+})
+
+function handleStream (stream) {
+  const video = document.querySelector('video')
+  video.srcObject = stream
+  video.onloadedmetadata = (e) => video.play()
+}
+
+function handleError (e) {
+  console.log(e)
+}
+```
+
+To capture video from a source provided by `desktopCapturer` the constraints
+passed to [`navigator.mediaDevices.getUserMedia`][] must include
+`chromeMediaSource: 'desktop'`, and `audio: false`.
+
+To capture both audio and video from the entire desktop the constraints passed
+to [`navigator.mediaDevices.getUserMedia`][] must include `chromeMediaSource: 'desktop'`,
+for both `audio` and `video`, but should not include a `chromeMediaSourceId` constraint.
+
 ```js
-// renderer.js
-const startButton = document.getElementById('startButton')
-const stopButton = document.getElementById('stopButton')
-const video = document.querySelector('video')
-
-startButton.addEventListener('click', () => {
-  navigator.mediaDevices.getDisplayMedia({
-    audio: true,
-    video: {
-      width: 320,
-      height: 240,
-      frameRate: 30
+const constraints = {
+  audio: {
+    mandatory: {
+      chromeMediaSource: 'desktop'
    }
-  }).then(stream => {
-    video.srcObject = stream
-    video.onloadedmetadata = (e) => video.play()
-  }).catch(e => console.log(e))
-})
-
-stopButton.addEventListener('click', () => {
-  video.pause()
-})
+  },
+  video: {
+    mandatory: {
+      chromeMediaSource: 'desktop'
+    }
+  }
+}
 ```

-```html
-<!-- index.html -->
-<html>
-<meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
-  <body>
-    <button id="startButton" class="button">Start</button>
-    <button id="stopButton" class="button">Stop</button>
-    <video width="320" height="240" autoplay></video>
-    <script src="renderer.js"></script>
-  </body>
-</html>
-```
-
-See [`navigator.mediaDevices.getDisplayMedia`](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia) for more information.
-
-**Note:** `navigator.mediaDevices.getDisplayMedia` does not permit the use of `deviceId` for
-selection of a source - see [specification](https://w3c.github.io/mediacapture-screen-share/#constraints).
-
 ## Methods

 The `desktopCapturer` module has the following methods:
--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -145,10 +145,6 @@ Returns `string` - The file name of the download item.
 disk. If user changes the file name in a prompted download saving dialog, the
 actual name of saved file will be different.

-#### `downloadItem.getCurrentBytesPerSecond()`
-
-Returns `Integer` - The current download speed in bytes per second.
-
 #### `downloadItem.getTotalBytes()`

 Returns `Integer` - The total size in bytes of the download item.
@@ -159,10 +155,6 @@ If the size is unknown, it returns 0.

 Returns `Integer` - The received bytes of the download item.

-#### `downloadItem.getPercentComplete()`
-
-Returns `Integer` - The download completion in percent.
-
 #### `downloadItem.getContentDisposition()`

 Returns `string` - The Content-Disposition field from the response
@@ -192,10 +184,6 @@ Returns `string` - ETag header value.
 Returns `Double` - Number of seconds since the UNIX epoch when the download was
 started.

-#### `downloadItem.getEndTime()`
-
-Returns `Double` - Number of seconds since the UNIX epoch when the download ended.
-
 ### Instance Properties

 #### `downloadItem.savePath`
--- a/docs/api/file-object.md
+++ b/docs/api/file-object.md
@@ -0,0 +1,36 @@
+# `File` Object
+
+> Use the HTML5 `File` API to work natively with files on the filesystem.
+
+> **Warning**
+> The `path` property that Electron adds to the `File` interface is deprecated
+> and **will** be removed in a future Electron release.  We recommend you
+> use `webUtils.getPathForFile` instead.
+
+The DOM's File interface provides abstraction around native files in order to
+let users work on native files directly with the HTML5 file API. Electron has
+added a `path` attribute to the `File` interface which exposes the file's real
+path on filesystem.
+
+Example of getting a real path from a dragged-onto-the-app file:
+
+```html
+<div id="holder">
+  Drag your file here
+</div>
+
+<script>
+  document.addEventListener('drop', (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    for (const f of e.dataTransfer.files) {
+      console.log('File(s) you dragged here: ', f.path)
+    }
+  });
+  document.addEventListener('dragover', (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+  });
+</script>
+```
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -72,7 +72,3 @@ or is being instructed to use an inverted color scheme.

 A `boolean` indicating whether Chromium is in forced colors mode, controlled by system accessibility settings.
 Currently, Windows high contrast is the only system setting that triggers forced colors mode.
-
-### `nativeTheme.prefersReducedTransparency` _Readonly_
-
-A `boolean` that indicates the whether the user has chosen via system accessibility settings to reduce transparency at the OS level.
--- a/docs/api/navigation-history.md
+++ b/docs/api/navigation-history.md
@@ -9,24 +9,6 @@ Each navigation entry corresponds to a specific page. The indexing system follow

 ### Instance Methods

-#### `navigationHistory.canGoBack()`
-
-Returns `boolean` - Whether the browser can go back to previous web page.
-
-#### `navigationHistory.canGoForward()`
-
-Returns `boolean` - Whether the browser can go forward to next web page.
-
-#### `navigationHistory.canGoToOffset(offset)`
-
-* `offset` Integer
-
-Returns `boolean` - Whether the web page can go to the specified `offset` from the current entry.
-
-#### `navigationHistory.clear()`
-
-Clears the navigation history.
-
 #### `navigationHistory.getActiveIndex()`

 Returns `Integer` - The index of the current page, from which we would go back/forward or reload.
@@ -42,26 +24,6 @@ Returns `Object`:

 If index is out of bounds (greater than history length or less than 0), null will be returned.

-#### `navigationHistory.goBack()`
-
-Makes the browser go back a web page.
-
-#### `navigationHistory.goForward()`
-
-Makes the browser go forward a web page.
-
-#### `navigationHistory.goToIndex(index)`
-
-* `index` Integer
-
-Navigates browser to the specified absolute web page index.
-
-#### `navigationHistory.goToOffset(offset)`
-
-* `offset` Integer
-
-Navigates to the specified offset from the current entry.
-
 #### `navigationHistory.length()`

 Returns `Integer` - History length.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -143,71 +143,6 @@ Returns:
 Emitted after an extension is loaded and all necessary browser state is
 initialized to support the start of the extension's background page.

-#### Event: 'file-system-access-restricted'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `origin` string - The origin that initiated access to the blocked path.
-  * `isDirectory` boolean - Whether or not the path is a directory.
-  * `path` string - The blocked path attempting to be accessed.
-* `callback` Function
-  * `action` string - The action to take as a result of the restricted path access attempt.
-    * `allow` - This will allow `path` to be accessed despite restricted status.
-    * `deny` - This will block the access request and trigger an [`AbortError`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/abort).
-    * `tryAgain` - This will open a new file picker and allow the user to choose another path.
-
-```js
-const { app, dialog, BrowserWindow, session } = require('electron')
-
-async function createWindow () {
-  const mainWindow = new BrowserWindow()
-
-  await mainWindow.loadURL('https://buzzfeed.com')
-
-  session.defaultSession.on('file-system-access-restricted', async (e, details, callback) => {
-    const { origin, path } = details
-    const { response } = await dialog.showMessageBox({
-      message: `Are you sure you want ${origin} to open restricted path ${path}?`,
-      title: 'File System Access Restricted',
-      buttons: ['Choose a different folder', 'Allow', 'Cancel'],
-      cancelId: 2
-    })
-
-    if (response === 0) {
-      callback('tryAgain')
-    } else if (response === 1) {
-      callback('allow')
-    } else {
-      callback('deny')
-    }
-  })
-
-  mainWindow.webContents.executeJavaScript(`
-    window.showDirectoryPicker({
-      id: 'electron-demo',
-      mode: 'readwrite',
-      startIn: 'downloads',
-    }).catch(e => {
-      console.log(e)
-    })`, true
-  )
-}
-
-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})
-```
-
 #### Event: 'preconnect'

 Returns:
--- a/docs/api/structures/cpu-usage.md
+++ b/docs/api/structures/cpu-usage.md
@@ -2,8 +2,6 @@

 * `percentCPUUsage` number - Percentage of CPU used since the last call to getCPUUsage.
  First call returns 0.
-* `cumulativeCPUUsage` number (optional) - Total seconds of CPU time used since process
-  startup.
 * `idleWakeupsPerSecond` number - The number of average idle CPU wakeups per second
  since the last call to getCPUUsage. First call returns 0. Will always return 0 on
  Windows.
--- a/docs/api/structures/trace-config.md
+++ b/docs/api/structures/trace-config.md
@@ -7,8 +7,8 @@
  recording buffer in events.
 * `enable_argument_filter` boolean (optional) - if true, filter event data
  according to a specific list of events that have been manually vetted to not
-  include any PII. See [the implementation in Chromium][trace_event_args_allowlist.cc]
-  for specifics.
+  include any PII. See [the implementation in
+  Chromium][trace_event_args_allowlist.cc] for specifics.
 * `included_categories` string[] (optional) - a list of tracing categories to
  include. Can include glob-like patterns using `*` at the end of the category
  name. See [tracing categories][] for the list of categories.
@@ -21,8 +21,8 @@
  with the trace.
 * `memory_dump_config` Record\<string, any\> (optional) - if the
  `disabled-by-default-memory-infra` category is enabled, this contains
-  optional additional configuration for data collection. See the
-  [Chromium memory-infra docs][memory-infra docs] for more information.
+  optional additional configuration for data collection. See the [Chromium
+  memory-infra docs][memory-infra docs] for more information.

 An example TraceConfig that roughly matches what Chrome DevTools records:

--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -401,12 +401,10 @@ Returns an object with system animation settings.

 ## Properties

-### `systemPreferences.accessibilityDisplayShouldReduceTransparency` _macOS_ _Deprecated_
+### `systemPreferences.accessibilityDisplayShouldReduceTransparency()` _macOS_

 A `boolean` property which determines whether the app avoids using semitransparent backgrounds. This maps to [NSWorkspace.accessibilityDisplayShouldReduceTransparency](https://developer.apple.com/documentation/appkit/nsworkspace/1533006-accessibilitydisplayshouldreduce)

-**Deprecated:** Use the new [`nativeTheme.prefersReducedTransparency`](native-theme.md#nativethemeprefersreducedtransparency-readonly) API.
-
 ### `systemPreferences.effectiveAppearance` _macOS_ _Readonly_

 A `string` property that can be `dark`, `light` or `unknown`.
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1124,60 +1124,44 @@ Reloads the current web page.

 Reloads current page and ignores cache.

-#### `contents.canGoBack()` _Deprecated_
+#### `contents.canGoBack()`

 Returns `boolean` - Whether the browser can go back to previous web page.

-**Deprecated:** Should use the new [`contents.navigationHistory.canGoBack`](navigation-history.md#navigationhistorycangoback) API.
-
-#### `contents.canGoForward()` _Deprecated_
+#### `contents.canGoForward()`

 Returns `boolean` - Whether the browser can go forward to next web page.

-**Deprecated:** Should use the new [`contents.navigationHistory.canGoForward`](navigation-history.md#navigationhistorycangoforward) API.
-
-#### `contents.canGoToOffset(offset)` _Deprecated_
+#### `contents.canGoToOffset(offset)`

 * `offset` Integer

 Returns `boolean` - Whether the web page can go to `offset`.

-**Deprecated:** Should use the new [`contents.navigationHistory.canGoToOffset`](navigation-history.md#navigationhistorycangotooffsetoffset) API.
-
-#### `contents.clearHistory()` _Deprecated_
+#### `contents.clearHistory()`

 Clears the navigation history.

-**Deprecated:** Should use the new [`contents.navigationHistory.clear`](navigation-history.md#navigationhistoryclear) API.
-
-#### `contents.goBack()` _Deprecated_
+#### `contents.goBack()`

 Makes the browser go back a web page.

-**Deprecated:** Should use the new [`contents.navigationHistory.goBack`](navigation-history.md#navigationhistorygoback) API.
-
-#### `contents.goForward()` _Deprecated_
+#### `contents.goForward()`

 Makes the browser go forward a web page.

-**Deprecated:** Should use the new [`contents.navigationHistory.goForward`](navigation-history.md#navigationhistorygoforward) API.
-
-#### `contents.goToIndex(index)` _Deprecated_
+#### `contents.goToIndex(index)`

 * `index` Integer

 Navigates browser to the specified absolute web page index.

-**Deprecated:** Should use the new [`contents.navigationHistory.goToIndex`](navigation-history.md#navigationhistorygotoindexindex) API.
-
-#### `contents.goToOffset(offset)` _Deprecated_
+#### `contents.goToOffset(offset)`

 * `offset` Integer

 Navigates to the specified offset from the "current entry".

-**Deprecated:** Should use the new [`contents.navigationHistory.goToOffset`](navigation-history.md#navigationhistorygotooffsetoffset) API.
-
 #### `contents.isCrashed()`

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

-## Planned Breaking API Changes (33.0)
-
-### Deprecated: `systemPreferences.accessibilityDisplayShouldReduceTransparency`
-
-The `systemPreferences.accessibilityDisplayShouldReduceTransparency` property is now deprecated in favor of the new `nativeTheme.prefersReducedTransparency`, which provides identical information and works cross-platform.
-
-```js
-// Deprecated
-const shouldReduceTransparency = systemPreferences.accessibilityDisplayShouldReduceTransparency
-
-// Replace with:
-const prefersReducedTransparency = nativeTheme.prefersReducedTransparency
-```
-
-## Planned Breaking API Changes (32.0)
-
-### Removed: `File.path`
-
-The nonstandard `path` property of the Web `File` object was added in an early version of Electron as a convenience method for working with native files when doing everything in the renderer was more common. However, it represents a deviation from the standard and poses a minor security risk as well, so beginning in Electron 32.0 it has been removed in favor of the [`webUtils.getPathForFile`](api/web-utils.md#webutilsgetpathforfilefile) method.
-
-```js
-// Before (renderer)
-
-const file = document.querySelector('input[type=file]')
-alert(`Uploaded file path was: ${file.path}`)
-```
-
-```js
-// After (renderer)
-
-const file = document.querySelector('input[type=file]')
-electron.showFilePath(file)
-
-// (preload)
-const { contextBridge, webUtils } = require('electron')
-
-contextBridge.exposeInMainWorld('electron', {
-  showFilePath (file) {
-    // It's best not to expose the full file path to the web content if
-    // possible.
-    const path = webUtils.getPathForFile(file)
-    alert(`Uploaded file path was: ${path}`)
-  }
-})
-```
-
-### Deprecated: `clearHistory`, `canGoBack`, `goBack`, `canGoForward`, `goForward`, `canGoToOffset`, `goToOffset` on `WebContents`
-
-The navigation-related APIs are now deprecated.
-
-These APIs have been moved to the `navigationHistory` property of `WebContents` to provide a more structured and intuitive interface for managing navigation history.
-
-```js
-// Deprecated
-win.webContents.clearHistory()
-win.webContents.canGoBack()
-win.webContents.goBack()
-win.webContents.canGoForward()
-win.webContents.goForward()
-win.webContents.canGoToOffset()
-win.webContents.goToOffset(index)
-
-// Replace with
-win.webContents.navigationHistory.clear()
-win.webContents.navigationHistory.canGoBack()
-win.webContents.navigationHistory.goBack()
-win.webContents.navigationHistory.canGoForward()
-win.webContents.navigationHistory.goForward()
-win.webContents.navigationHistory.canGoToOffset()
-win.webContents.navigationHistory.goToOffset(index)
-```
-
 ## Planned Breaking API Changes (31.0)

 ### Removed: `WebSQL` support
@@ -92,7 +20,7 @@ Chromium has removed support for WebSQL upstream, transitioning it to Android on
 [Chromium's intent to remove discussion](https://groups.google.com/a/chromium.org/g/blink-dev/c/fWYb6evVA-w/m/wGI863zaAAAJ)
 for more information.

-### Behavior Changed: `nativeImage.toDataURL` will preserve PNG colorspace
+### Behavior Changed: `nativeImage.toDataURL` will preseve PNG colorspace

 PNG decoder implementation has been changed to preserve colorspace data, the
 encoded data returned from this function now matches it.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -329,7 +329,3 @@ Error: Cannot find module '/Users/<user>/.electron_build_tools/src/e'
 ```

 We recommend installing Node through [nvm](https://github.com/nvm-sh/nvm). This allows for easier Node version management, and is often a fix for missing `e` modules.
-
-### RBE authentication randomly fails with "Token not valid"
-
-This could be caused by the local clock time on the machine being off by a small amount. Use [time.is](https://time.is/) to check.
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -41,7 +41,7 @@ etc.

 * Write [remark](https://github.com/remarkjs/remark) markdown style.

-You can run `npm run lint:docs` to ensure that your documentation changes are
+You can run `npm run lint-docs` to ensure that your documentation changes are
 formatted correctly.

 ## JavaScript
--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -78,7 +78,8 @@ Electron

 ## Structure of Other Directories

-* **.github** - GitHub-specific config files including issues templates, CI with GitHub Actions and CODEOWNERS.
+* **.circleci** - Config file for CI with CircleCI.
+* **.github** - GitHub-specific config files including issues templates and CODEOWNERS.
 * **dist** - Temporary directory created by `script/create-dist.py` script
  when creating a distribution.
 * **node_modules** - Third party node modules used for building.
--- a/docs/fiddles/features/dark-mode/index.html
+++ b/docs/fiddles/features/dark-mode/index.html
@@ -14,5 +14,6 @@
    <button id="reset-to-system">Reset to System Theme</button>

    <script src="renderer.js"></script>
+  </body>
 </body>
 </html>
--- a/docs/tutorial/dark-mode.md
+++ b/docs/tutorial/dark-mode.md
@@ -75,6 +75,7 @@ Starting with the `index.html` file:
    <button id="reset-to-system">Reset to System Theme</button>

    <script src="renderer.js"></script>
+  </body>
 </body>
 </html>
 ```
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -98,12 +98,19 @@ is as follows:

 <img src="https://raw.githubusercontent.com/nodejs/Release/main/schedule.svg?sanitize=true" alt="Releases">

+As a rule, stable branches of Electron do not receive Node.js upgrades after they have been cut.
 If Electron has recently updated its `main` branch to a new major version of Node.js, the next stable
 branch to be cut will be released with the new version.

-Stable release lines of Electron will receive minor and patch bumps of Node.js after they are released.
-Patch bumps to Node.js will be released in patch releases of Electron, and minor bumps to Node.js will result in a minor release of Electron.
-Security-only release branches will receive security-related changes from Node.js releases, but not the full release.
+Patch upgrades of Node that contain significant security or bug fixes, and are submitted
+more than 2 weeks prior to a stable release date, will be accepted into an Electron alpha
+or beta release branch.
+
+Minor upgrades of Node that contain significant security or bug fixes, and are submitted
+more than 2 weeks prior to a stable release date may be accepted into an Electron alpha or
+beta release branch on a case-by-case basis. These requests will be reviewed and voted on
+by the [Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases),
+to ensure minimal disruption for developers who may be consuming alpha or beta releases.

 ### Breaking API changes

--- a/docs/tutorial/offscreen-rendering.md
+++ b/docs/tutorial/offscreen-rendering.md
@@ -82,5 +82,4 @@ app.on('window-all-closed', () => {

 After launching the Electron application, navigate to your application's
 working folder, where you'll find the rendered image.
-
 [disablehardwareacceleration]: ../api/app.md#appdisablehardwareacceleration
--- a/docs/tutorial/progress-bar.md
+++ b/docs/tutorial/progress-bar.md
@@ -112,5 +112,4 @@ For macOS, the progress bar will also be indicated for your application
 when using [Mission Control](https://support.apple.com/en-us/HT204100):

 ![Mission Control Progress Bar](../images/mission-control-progress-bar.png)
-
 [setprogressbar]: ../api/browser-window.md#winsetprogressbarprogress-options
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -121,8 +121,8 @@ To automate the detection of misconfigurations and insecure patterns, it is
 possible to use
 [Electronegativity](https://github.com/doyensec/electronegativity). For
 additional details on potential weaknesses and implementation bugs when
-developing applications using Electron, please refer to this
-[guide for developers and auditors](https://doyensec.com/resources/us-17-Carettoni-Electronegativity-A-Study-Of-Electron-Security-wp.pdf).
+developing applications using Electron, please refer to this [guide for
+developers and auditors](https://doyensec.com/resources/us-17-Carettoni-Electronegativity-A-Study-Of-Electron-Security-wp.pdf).

 ### 1. Only load secure content

@@ -644,8 +644,8 @@ windows at runtime.

 #### How?

-[`webContents`][web-contents] will delegate to its
-[window open handler][window-open-handler] before creating new windows. The handler will
+[`webContents`][web-contents] will delegate to its [window open
+handler][window-open-handler] before creating new windows. The handler will
 receive, amongst other parameters, the `url` the window was requested to open
 and the options used to create it. We recommend that you register a handler to
 monitor the creation of windows, and deny any unexpected window creation.
--- a/docs/tutorial/tutorial-6-publishing-updating.md
+++ b/docs/tutorial/tutorial-6-publishing-updating.md
@@ -222,8 +222,8 @@ rest of our docs and happy developing! If you have questions, please stop by our
 [code-signed]: ./code-signing.md
 [discord server]: https://discord.gg/electronjs
 [electron fiddle]: https://www.electronjs.org/fiddle
-[fiddle-build]: https://github.com/electron/fiddle/blob/main/.circleci/config.yml
-[fiddle-forge-config]: https://github.com/electron/fiddle/blob/main/forge.config.ts
+[fiddle-build]: https://github.com/electron/fiddle/blob/main/.github/workflows/build.yaml
+[fiddle-forge-config]: https://github.com/electron/fiddle/blob/main/forge.config.js
 [github actions]: https://github.com/features/actions
 [github publisher]: https://www.electronforge.io/config/publishers/github
 [github releases]: https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository
--- a/docs/tutorial/using-native-node-modules.md
+++ b/docs/tutorial/using-native-node-modules.md
@@ -40,8 +40,8 @@ npm install --save-dev @electron/rebuild
 .\node_modules\.bin\electron-rebuild.cmd
 ```

-For more information on usage and integration with other tools such as
-[Electron Packager][electron-packager], consult the project's README.
+For more information on usage and integration with other tools such as [Electron
+Packager][electron-packager], consult the project's README.

 ### Using `npm`

@@ -108,8 +108,8 @@ the following things:
 On Windows, by default, `node-gyp` links native modules against `node.dll`.
 However, in Electron 4.x and higher, the symbols needed by native modules are
 exported by `electron.exe`, and there is no `node.dll`. In order to load native
-modules on Windows, `node-gyp` installs a
-[delay-load hook](https://learn.microsoft.com/en-us/cpp/build/reference/error-handling-and-notification?view=msvc-170#notification-hooks) that triggers
+modules on Windows, `node-gyp` installs a [delay-load
+hook](https://learn.microsoft.com/en-us/cpp/build/reference/error-handling-and-notification?view=msvc-170#notification-hooks) that triggers
 when the native module is loaded, and redirects the `node.dll` reference to use
 the loading executable instead of looking for `node.dll` in the library search
 path (which would turn up nothing). As such, on Electron 4.x and higher,
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -187,9 +187,9 @@ template("electron_paks") {
      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
      "${root_gen_dir}/extensions/strings/extensions_strings_",
      "${root_gen_dir}/services/strings/services_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
      "${root_gen_dir}/ui/strings/app_locale_settings_",
-      "${root_gen_dir}/ui/strings/auto_image_annotation_strings_",
      "${root_gen_dir}/ui/strings/ax_strings_",
      "${root_gen_dir}/ui/strings/ui_strings_",
    ]
@@ -204,8 +204,8 @@ template("electron_paks") {
      "//extensions/strings",
      "//services/strings",
      "//third_party/blink/public/strings",
+      "//third_party/blink/public/strings:accessibility_strings",
      "//ui/strings:app_locale_settings",
-      "//ui/strings:auto_image_annotation_strings",
      "//ui/strings:ax_strings",
      "//ui/strings:ui_strings",
    ]
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -22,6 +22,7 @@ auto_filenames = {
    "docs/api/download-item.md",
    "docs/api/environment-variables.md",
    "docs/api/extensions.md",
+    "docs/api/file-object.md",
    "docs/api/global-shortcut.md",
    "docs/api/in-app-purchase.md",
    "docs/api/incoming-message.md",
@@ -354,7 +355,6 @@ auto_filenames = {
    "lib/browser/message-port-main.ts",
    "lib/common/api/net-client-request.ts",
    "lib/common/define-properties.ts",
-    "lib/common/deprecate.ts",
    "lib/common/init.ts",
    "lib/common/webpack-globals-provider.ts",
    "lib/utility/api/exports/electron.ts",
--- a/filenames.gni
+++ b/filenames.gni
@@ -159,12 +159,8 @@ filenames = {
    "shell/browser/osr/osr_web_contents_view_mac.mm",
    "shell/browser/relauncher_mac.cc",
    "shell/browser/ui/certificate_trust_mac.mm",
-    "shell/browser/ui/cocoa/delayed_native_view_host.h",
-    "shell/browser/ui/cocoa/delayed_native_view_host.mm",
    "shell/browser/ui/cocoa/electron_bundle_mover.h",
    "shell/browser/ui/cocoa/electron_bundle_mover.mm",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
    "shell/browser/ui/cocoa/electron_menu_controller.h",
    "shell/browser/ui/cocoa/electron_menu_controller.mm",
    "shell/browser/ui/cocoa/electron_native_widget_mac.h",
@@ -191,8 +187,6 @@ filenames = {
    "shell/browser/ui/cocoa/window_buttons_proxy.mm",
    "shell/browser/ui/drag_util_mac.mm",
    "shell/browser/ui/file_dialog_mac.mm",
-    "shell/browser/ui/inspectable_web_contents_view_mac.h",
-    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
    "shell/browser/ui/message_box_mac.mm",
    "shell/browser/ui/tray_icon_cocoa.h",
    "shell/browser/ui/tray_icon_cocoa.mm",
@@ -208,6 +202,7 @@ filenames = {
    "shell/common/node_bindings_mac.cc",
    "shell/common/node_bindings_mac.h",
    "shell/common/platform_util_mac.mm",
+    "shell/browser/ui/views/inspectable_web_contents_view_mac.mm",
  ]

  lib_sources_views = [
@@ -222,8 +217,6 @@ filenames = {
    "shell/browser/ui/views/electron_views_delegate.h",
    "shell/browser/ui/views/frameless_view.cc",
    "shell/browser/ui/views/frameless_view.h",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.cc",
-    "shell/browser/ui/views/inspectable_web_contents_view_views.h",
    "shell/browser/ui/views/menu_bar.cc",
    "shell/browser/ui/views/menu_bar.h",
    "shell/browser/ui/views/menu_delegate.cc",
@@ -297,6 +290,7 @@ filenames = {
    "shell/browser/api/electron_api_push_notifications.cc",
    "shell/browser/api/electron_api_push_notifications.h",
    "shell/browser/api/electron_api_safe_storage.cc",
+    "shell/browser/api/electron_api_safe_storage.h",
    "shell/browser/api/electron_api_screen.cc",
    "shell/browser/api/electron_api_screen.h",
    "shell/browser/api/electron_api_service_worker_context.cc",
@@ -394,8 +388,6 @@ filenames = {
    "shell/browser/file_system_access/file_system_access_permission_context.h",
    "shell/browser/file_system_access/file_system_access_permission_context_factory.cc",
    "shell/browser/file_system_access/file_system_access_permission_context_factory.h",
-    "shell/browser/file_system_access/file_system_access_web_contents_helper.cc",
-    "shell/browser/file_system_access/file_system_access_web_contents_helper.h",
    "shell/browser/font_defaults.cc",
    "shell/browser/font_defaults.h",
    "shell/browser/hid/electron_hid_delegate.cc",
@@ -548,6 +540,7 @@ filenames = {
    "shell/common/api/electron_api_clipboard.h",
    "shell/common/api/electron_api_command_line.cc",
    "shell/common/api/electron_api_environment.cc",
+    "shell/common/api/electron_api_key_weak_map.h",
    "shell/common/api/electron_api_native_image.cc",
    "shell/common/api/electron_api_native_image.h",
    "shell/common/api/electron_api_net.cc",
@@ -559,6 +552,8 @@ filenames = {
    "shell/common/api/electron_bindings.cc",
    "shell/common/api/electron_bindings.h",
    "shell/common/api/features.cc",
+    "shell/common/api/object_life_monitor.cc",
+    "shell/common/api/object_life_monitor.h",
    "shell/common/application_info.cc",
    "shell/common/application_info.h",
    "shell/common/asar/archive.cc",
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -73,7 +73,37 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__algorithm/partition_point.h",
  "//third_party/libc++/src/include/__algorithm/pop_heap.h",
  "//third_party/libc++/src/include/__algorithm/prev_permutation.h",
-  "//third_party/libc++/src/include/__algorithm/pstl.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_any_all_none_of.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backend.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backend.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/any_of.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/backend.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/fill.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/find_if.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/for_each.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/libdispatch.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/merge.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/serial.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/stable_sort.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/thread.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/transform.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_copy.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_count.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_equal.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_fill.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_find.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_for_each.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_frontend_dispatch.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_generate.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_is_partitioned.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_merge.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_move.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_replace.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_rotate_copy.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_sort.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_stable_sort.h",
+  "//third_party/libc++/src/include/__algorithm/pstl_transform.h",
  "//third_party/libc++/src/include/__algorithm/push_heap.h",
  "//third_party/libc++/src/include/__algorithm/ranges_adjacent_find.h",
  "//third_party/libc++/src/include/__algorithm/ranges_all_of.h",
@@ -209,7 +239,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__atomic/atomic_flag.h",
  "//third_party/libc++/src/include/__atomic/atomic_init.h",
  "//third_party/libc++/src/include/__atomic/atomic_lock_free.h",
-  "//third_party/libc++/src/include/__atomic/atomic_ref.h",
  "//third_party/libc++/src/include/__atomic/atomic_sync.h",
  "//third_party/libc++/src/include/__atomic/check_memory_order.h",
  "//third_party/libc++/src/include/__atomic/contention_t.h",
@@ -218,7 +247,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__atomic/is_always_lock_free.h",
  "//third_party/libc++/src/include/__atomic/kill_dependency.h",
  "//third_party/libc++/src/include/__atomic/memory_order.h",
-  "//third_party/libc++/src/include/__atomic/to_gcc_order.h",
+  "//third_party/libc++/src/include/__availability",
  "//third_party/libc++/src/include/__bit/bit_cast.h",
  "//third_party/libc++/src/include/__bit/bit_ceil.h",
  "//third_party/libc++/src/include/__bit/bit_floor.h",
@@ -250,14 +279,11 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__chrono/convert_to_tm.h",
  "//third_party/libc++/src/include/__chrono/day.h",
  "//third_party/libc++/src/include/__chrono/duration.h",
-  "//third_party/libc++/src/include/__chrono/exception.h",
  "//third_party/libc++/src/include/__chrono/file_clock.h",
  "//third_party/libc++/src/include/__chrono/formatter.h",
  "//third_party/libc++/src/include/__chrono/hh_mm_ss.h",
  "//third_party/libc++/src/include/__chrono/high_resolution_clock.h",
-  "//third_party/libc++/src/include/__chrono/leap_second.h",
  "//third_party/libc++/src/include/__chrono/literals.h",
-  "//third_party/libc++/src/include/__chrono/local_info.h",
  "//third_party/libc++/src/include/__chrono/month.h",
  "//third_party/libc++/src/include/__chrono/month_weekday.h",
  "//third_party/libc++/src/include/__chrono/monthday.h",
@@ -265,7 +291,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__chrono/parser_std_format_spec.h",
  "//third_party/libc++/src/include/__chrono/statically_widen.h",
  "//third_party/libc++/src/include/__chrono/steady_clock.h",
-  "//third_party/libc++/src/include/__chrono/sys_info.h",
  "//third_party/libc++/src/include/__chrono/system_clock.h",
  "//third_party/libc++/src/include/__chrono/time_point.h",
  "//third_party/libc++/src/include/__chrono/time_zone.h",
@@ -277,7 +302,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__chrono/year_month.h",
  "//third_party/libc++/src/include/__chrono/year_month_day.h",
  "//third_party/libc++/src/include/__chrono/year_month_weekday.h",
-  "//third_party/libc++/src/include/__chrono/zoned_time.h",
  "//third_party/libc++/src/include/__compare/common_comparison_category.h",
  "//third_party/libc++/src/include/__compare/compare_partial_order_fallback.h",
  "//third_party/libc++/src/include/__compare/compare_strong_order_fallback.h",
@@ -316,17 +340,11 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__condition_variable/condition_variable.h",
  "//third_party/libc++/src/include/__config",
  "//third_party/libc++/src/include/__config_site.in",
-  "//third_party/libc++/src/include/__configuration/abi.h",
-  "//third_party/libc++/src/include/__configuration/availability.h",
-  "//third_party/libc++/src/include/__configuration/compiler.h",
-  "//third_party/libc++/src/include/__configuration/language.h",
-  "//third_party/libc++/src/include/__configuration/platform.h",
  "//third_party/libc++/src/include/__coroutine/coroutine_handle.h",
  "//third_party/libc++/src/include/__coroutine/coroutine_traits.h",
  "//third_party/libc++/src/include/__coroutine/noop_coroutine_handle.h",
  "//third_party/libc++/src/include/__coroutine/trivial_awaitables.h",
  "//third_party/libc++/src/include/__debug_utils/randomize_range.h",
-  "//third_party/libc++/src/include/__debug_utils/sanitizers.h",
  "//third_party/libc++/src/include/__debug_utils/strict_weak_ordering_check.h",
  "//third_party/libc++/src/include/__exception/exception.h",
  "//third_party/libc++/src/include/__exception/exception_ptr.h",
@@ -378,7 +396,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__format/formatter_pointer.h",
  "//third_party/libc++/src/include/__format/formatter_string.h",
  "//third_party/libc++/src/include/__format/formatter_tuple.h",
-  "//third_party/libc++/src/include/__format/indic_conjunct_break_table.h",
  "//third_party/libc++/src/include/__format/parser_std_format_spec.h",
  "//third_party/libc++/src/include/__format/range_default_formatter.h",
  "//third_party/libc++/src/include/__format/range_formatter.h",
@@ -440,7 +457,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__ios/fpos.h",
  "//third_party/libc++/src/include/__iterator/access.h",
  "//third_party/libc++/src/include/__iterator/advance.h",
-  "//third_party/libc++/src/include/__iterator/aliasing_iterator.h",
  "//third_party/libc++/src/include/__iterator/back_insert_iterator.h",
  "//third_party/libc++/src/include/__iterator/bounded_iter.h",
  "//third_party/libc++/src/include/__iterator/common_iterator.h",
@@ -569,31 +585,13 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__numeric/iota.h",
  "//third_party/libc++/src/include/__numeric/midpoint.h",
  "//third_party/libc++/src/include/__numeric/partial_sum.h",
-  "//third_party/libc++/src/include/__numeric/pstl.h",
+  "//third_party/libc++/src/include/__numeric/pstl_reduce.h",
+  "//third_party/libc++/src/include/__numeric/pstl_transform_reduce.h",
  "//third_party/libc++/src/include/__numeric/reduce.h",
  "//third_party/libc++/src/include/__numeric/saturation_arithmetic.h",
  "//third_party/libc++/src/include/__numeric/transform_exclusive_scan.h",
  "//third_party/libc++/src/include/__numeric/transform_inclusive_scan.h",
  "//third_party/libc++/src/include/__numeric/transform_reduce.h",
-  "//third_party/libc++/src/include/__ostream/basic_ostream.h",
-  "//third_party/libc++/src/include/__ostream/print.h",
-  "//third_party/libc++/src/include/__pstl/backend.h",
-  "//third_party/libc++/src/include/__pstl/backend_fwd.h",
-  "//third_party/libc++/src/include/__pstl/backends/default.h",
-  "//third_party/libc++/src/include/__pstl/backends/libdispatch.h",
-  "//third_party/libc++/src/include/__pstl/backends/serial.h",
-  "//third_party/libc++/src/include/__pstl/backends/std_thread.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/any_of.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/cpu_traits.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/fill.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/find_if.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/for_each.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/merge.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/stable_sort.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/transform.h",
-  "//third_party/libc++/src/include/__pstl/cpu_algos/transform_reduce.h",
-  "//third_party/libc++/src/include/__pstl/dispatch.h",
-  "//third_party/libc++/src/include/__pstl/handle_exception.h",
  "//third_party/libc++/src/include/__random/bernoulli_distribution.h",
  "//third_party/libc++/src/include/__random/binomial_distribution.h",
  "//third_party/libc++/src/include/__random/cauchy_distribution.h",
@@ -712,14 +710,13 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__thread/timed_backoff_policy.h",
  "//third_party/libc++/src/include/__tree",
  "//third_party/libc++/src/include/__tuple/find_index.h",
-  "//third_party/libc++/src/include/__tuple/ignore.h",
  "//third_party/libc++/src/include/__tuple/make_tuple_types.h",
+  "//third_party/libc++/src/include/__tuple/pair_like.h",
  "//third_party/libc++/src/include/__tuple/sfinae_helpers.h",
  "//third_party/libc++/src/include/__tuple/tuple_element.h",
  "//third_party/libc++/src/include/__tuple/tuple_indices.h",
  "//third_party/libc++/src/include/__tuple/tuple_like.h",
  "//third_party/libc++/src/include/__tuple/tuple_like_ext.h",
-  "//third_party/libc++/src/include/__tuple/tuple_like_no_subrange.h",
  "//third_party/libc++/src/include/__tuple/tuple_size.h",
  "//third_party/libc++/src/include/__tuple/tuple_types.h",
  "//third_party/libc++/src/include/__type_traits/add_const.h",
@@ -731,6 +728,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__type_traits/aligned_storage.h",
  "//third_party/libc++/src/include/__type_traits/aligned_union.h",
  "//third_party/libc++/src/include/__type_traits/alignment_of.h",
+  "//third_party/libc++/src/include/__type_traits/apply_cv.h",
  "//third_party/libc++/src/include/__type_traits/can_extract_key.h",
  "//third_party/libc++/src/include/__type_traits/common_reference.h",
  "//third_party/libc++/src/include/__type_traits/common_type.h",
@@ -741,7 +739,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__type_traits/datasizeof.h",
  "//third_party/libc++/src/include/__type_traits/decay.h",
  "//third_party/libc++/src/include/__type_traits/dependent_type.h",
-  "//third_party/libc++/src/include/__type_traits/desugars_to.h",
  "//third_party/libc++/src/include/__type_traits/disjunction.h",
  "//third_party/libc++/src/include/__type_traits/enable_if.h",
  "//third_party/libc++/src/include/__type_traits/extent.h",
@@ -779,6 +776,8 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__type_traits/is_implicitly_default_constructible.h",
  "//third_party/libc++/src/include/__type_traits/is_integral.h",
  "//third_party/libc++/src/include/__type_traits/is_literal_type.h",
+  "//third_party/libc++/src/include/__type_traits/is_member_function_pointer.h",
+  "//third_party/libc++/src/include/__type_traits/is_member_object_pointer.h",
  "//third_party/libc++/src/include/__type_traits/is_member_pointer.h",
  "//third_party/libc++/src/include/__type_traits/is_nothrow_assignable.h",
  "//third_party/libc++/src/include/__type_traits/is_nothrow_constructible.h",
@@ -824,6 +823,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__type_traits/nat.h",
  "//third_party/libc++/src/include/__type_traits/negation.h",
  "//third_party/libc++/src/include/__type_traits/noexcept_move_assign_container.h",
+  "//third_party/libc++/src/include/__type_traits/operation_traits.h",
  "//third_party/libc++/src/include/__type_traits/promote.h",
  "//third_party/libc++/src/include/__type_traits/rank.h",
  "//third_party/libc++/src/include/__type_traits/remove_all_extents.h",
@@ -857,13 +857,11 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__utility/in_place.h",
  "//third_party/libc++/src/include/__utility/integer_sequence.h",
  "//third_party/libc++/src/include/__utility/is_pointer_in_range.h",
-  "//third_party/libc++/src/include/__utility/is_valid_range.h",
  "//third_party/libc++/src/include/__utility/move.h",
  "//third_party/libc++/src/include/__utility/no_destroy.h",
  "//third_party/libc++/src/include/__utility/pair.h",
  "//third_party/libc++/src/include/__utility/piecewise_construct.h",
  "//third_party/libc++/src/include/__utility/priority_tag.h",
-  "//third_party/libc++/src/include/__utility/private_constructor_tag.h",
  "//third_party/libc++/src/include/__utility/rel_ops.h",
  "//third_party/libc++/src/include/__utility/small_buffer.h",
  "//third_party/libc++/src/include/__utility/swap.h",
@@ -954,6 +952,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/istream",
  "//third_party/libc++/src/include/iterator",
  "//third_party/libc++/src/include/latch",
+  "//third_party/libc++/src/include/libcxx.imp",
  "//third_party/libc++/src/include/limits",
  "//third_party/libc++/src/include/list",
  "//third_party/libc++/src/include/locale",
--- a/lib/browser/api/desktop-capturer.ts
+++ b/lib/browser/api/desktop-capturer.ts
@@ -1,4 +1,3 @@
-import { BrowserWindow } from 'electron/main';
 const { createDesktopCapturer } = process._linkedBinding('electron_browser_desktop_capturer');

 const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);
@@ -16,16 +15,6 @@ function isValid (options: Electron.SourcesOptions) {
 export async function getSources (args: Electron.SourcesOptions) {
  if (!isValid(args)) throw new Error('Invalid options');

-  const resizableValues = new Map();
-  if (process.platform === 'darwin') {
-    // Fix for bug in ScreenCaptureKit that modifies a window's styleMask the first time
-    // it captures a non-resizable window. We record each non-resizable window's styleMask,
-    // and we restore modified styleMasks later, after the screen capture.
-    for (const win of BrowserWindow.getAllWindows()) {
-      resizableValues.set([win.id], win.resizable);
-    }
-  }
-
  const captureWindow = args.types.includes('window');
  const captureScreen = args.types.includes('screen');

@@ -55,14 +44,6 @@ export async function getSources (args: Electron.SourcesOptions) {
        delete capturer._onerror;
        delete capturer._onfinished;
        capturer = null;
-
-        if (process.platform === 'darwin') {
-          for (const win of BrowserWindow.getAllWindows()) {
-            if (resizableValues.has(win.id)) {
-              win.resizable = resizableValues.get(win.id);
-            }
-          };
-        }
      }
      // Remove from currentlyRunning once we resolve or reject
      currentlyRunning = currentlyRunning.filter(running => running.options !== options);
--- a/lib/browser/api/system-preferences.ts
+++ b/lib/browser/api/system-preferences.ts
@@ -1,4 +1,3 @@
-import * as deprecate from '@electron/internal/common/deprecate';
 const { systemPreferences } = process._linkedBinding('electron_browser_system_preferences');

 if ('getEffectiveAppearance' in systemPreferences) {
@@ -8,15 +7,4 @@ if ('getEffectiveAppearance' in systemPreferences) {
  });
 }

-if ('accessibilityDisplayShouldReduceTransparency' in systemPreferences) {
-  const reduceTransparencyDeprecated = deprecate.warnOnce('systemPreferences.accessibilityDisplayShouldReduceTransparency', 'nativeTheme.prefersReducedTransparency');
-  const nativeReduceTransparency = systemPreferences.accessibilityDisplayShouldReduceTransparency;
-  Object.defineProperty(systemPreferences, 'accessibilityDisplayShouldReduceTransparency', {
-    get: () => {
-      reduceTransparencyDeprecated();
-      return nativeReduceTransparency;
-    }
-  });
-}
-
 export default systemPreferences;
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -510,54 +510,6 @@ const environment = process._linkedBinding('electron_common_environment');
 const loggingEnabled = () => {
  return environment.hasVar('ELECTRON_ENABLE_LOGGING') || commandLine.hasSwitch('enable-logging');
 };
-// Deprecation warnings for navigation related APIs.
-const canGoBackDeprecated = deprecate.warnOnce('webContents.canGoBack', 'webContents.navigationHistory.canGoBack');
-WebContents.prototype.canGoBack = function () {
-  canGoBackDeprecated();
-  return this._canGoBack();
-};
-
-const canGoForwardDeprecated = deprecate.warnOnce('webContents.canGoForward', 'webContents.navigationHistory.canGoForward');
-WebContents.prototype.canGoForward = function () {
-  canGoForwardDeprecated();
-  return this._canGoForward();
-};
-
-const canGoToOffsetDeprecated = deprecate.warnOnce('webContents.canGoToOffset', 'webContents.navigationHistory.canGoToOffset');
-WebContents.prototype.canGoToOffset = function () {
-  canGoToOffsetDeprecated();
-  return this._canGoToOffset();
-};
-
-const clearHistoryDeprecated = deprecate.warnOnce('webContents.clearHistory', 'webContents.navigationHistory.clear');
-WebContents.prototype.clearHistory = function () {
-  clearHistoryDeprecated();
-  return this._clearHistory();
-};
-
-const goBackDeprecated = deprecate.warnOnce('webContents.goBack', 'webContents.navigationHistory.goBack');
-WebContents.prototype.goBack = function () {
-  goBackDeprecated();
-  return this._goBack();
-};
-
-const goForwardDeprecated = deprecate.warnOnce('webContents.goForward', 'webContents.navigationHistory.goForward');
-WebContents.prototype.goForward = function () {
-  goForwardDeprecated();
-  return this._goForward();
-};
-
-const goToIndexDeprecated = deprecate.warnOnce('webContents.goToIndex', 'webContents.navigationHistory.goToIndex');
-WebContents.prototype.goToIndex = function (index: number) {
-  goToIndexDeprecated();
-  return this._goToIndex(index);
-};
-
-const goToOffsetDeprecated = deprecate.warnOnce('webContents.goToOffset', 'webContents.navigationHistory.goToOffset');
-WebContents.prototype.goToOffset = function (index: number) {
-  goToOffsetDeprecated();
-  return this._goToOffset(index);
-};

 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
@@ -585,14 +537,6 @@ WebContents.prototype._init = function () {
  // maintaining a list of navigation entries for backward and forward navigation.
  Object.defineProperty(this, 'navigationHistory', {
    value: {
-      canGoBack: this._canGoBack.bind(this),
-      canGoForward: this._canGoForward.bind(this),
-      canGoToOffset: this._canGoToOffset.bind(this),
-      clear: this._clearHistory.bind(this),
-      goBack: this._goBack.bind(this),
-      goForward: this._goForward.bind(this),
-      goToIndex: this._goToIndex.bind(this),
-      goToOffset: this._goToOffset.bind(this),
      getActiveIndex: this._getActiveIndex.bind(this),
      length: this._historyLength.bind(this),
      getEntryAtIndex: this._getNavigationEntryAtIndex.bind(this)
--- a/lib/browser/guest-view-manager.ts
+++ b/lib/browser/guest-view-manager.ts
@@ -2,7 +2,7 @@ import { webContents } from 'electron/main';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { parseWebViewWebPreferences } from '@electron/internal/browser/parse-features-string';
-import { syncMethods, asyncMethods, properties, navigationHistorySyncMethods } from '@electron/internal/common/web-view-methods';
+import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
 import { webViewEvents } from '@electron/internal/browser/web-view-events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';

@@ -311,14 +311,6 @@ handleMessageSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, function (event, guestIn
  if (!syncMethods.has(method)) {
    throw new Error(`Invalid method: ${method}`);
  }
-  // Redirect history methods to updated navigationHistory property on webContents. See issue #42879.
-  if (navigationHistorySyncMethods.has(method)) {
-    let navigationMethod = method;
-    if (method === 'clearHistory') {
-      navigationMethod = 'clear';
-    }
-    return (guest as any).navigationHistory[navigationMethod](...args);
-  }

  return (guest as any)[method](...args);
 });
--- a/lib/common/web-view-methods.ts
+++ b/lib/common/web-view-methods.ts
@@ -1,14 +1,3 @@
-export const navigationHistorySyncMethods = new Set([
-  'canGoBack',
-  'canGoForward',
-  'canGoToOffset',
-  'clearHistory',
-  'goBack',
-  'goForward',
-  'goToIndex',
-  'goToOffset'
-]);
-
 // Public-facing API methods.
 export const syncMethods = new Set([
  'getURL',
@@ -19,6 +8,14 @@ export const syncMethods = new Set([
  'stop',
  'reload',
  'reloadIgnoringCache',
+  'canGoBack',
+  'canGoForward',
+  'canGoToOffset',
+  'clearHistory',
+  'goBack',
+  'goForward',
+  'goToIndex',
+  'goToOffset',
  'isCrashed',
  'setUserAgent',
  'getUserAgent',
@@ -54,8 +51,7 @@ export const syncMethods = new Set([
  'getZoomFactor',
  'getZoomLevel',
  'setZoomFactor',
-  'setZoomLevel',
-  ...navigationHistorySyncMethods
+  'setZoomLevel'
 ]);

 export const properties = new Set([
--- a/package.json
+++ b/package.json
@@ -6,10 +6,10 @@
  "devDependencies": {
    "@azure/storage-blob": "^12.9.0",
    "@electron/asar": "^3.2.1",
-    "@electron/docs-parser": "^1.2.1",
+    "@electron/docs-parser": "^1.2.0",
    "@electron/fiddle-core": "^1.0.4",
    "@electron/github-app-auth": "^2.0.0",
-    "@electron/lint-roller": "^2.3.0",
+    "@electron/lint-roller": "^1.12.1",
    "@electron/typescript-definitions": "^8.15.2",
    "@octokit/rest": "^19.0.7",
    "@primer/octicons": "^10.0.0",
@@ -53,7 +53,6 @@
    "husky": "^8.0.1",
    "lint": "^1.1.2",
    "lint-staged": "^10.2.11",
-    "markdownlint-cli2": "^0.13.0",
    "minimist": "^1.2.6",
    "null-loader": "^4.0.0",
    "pre-flight": "^1.1.0",
@@ -88,10 +87,10 @@
    "lint:gn": "node ./script/lint.js --gn",
    "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:ts-check-js-in-markdown && npm run lint:docs-fiddles && npm run lint:docs-relative-links && npm run lint:markdown",
    "lint:docs-fiddles": "standard \"docs/fiddles/**/*.js\"",
-    "lint:docs-relative-links": "lint-roller-markdown-links --root docs \"**/*.md\"",
+    "lint:docs-relative-links": "electron-lint-markdown-links --root docs \"**/*.md\"",
    "lint:markdown": "node ./script/lint.js --md",
-    "lint:ts-check-js-in-markdown": "lint-roller-markdown-ts-check --root docs \"**/*.md\" --ignore \"breaking-changes.md\"",
-    "lint:js-in-markdown": "lint-roller-markdown-standard --root docs \"**/*.md\"",
+    "lint:ts-check-js-in-markdown": "electron-lint-markdown-ts-check --root docs \"**/*.md\" --ignore \"breaking-changes.md\"",
+    "lint:js-in-markdown": "electron-lint-markdown-standard --root docs \"**/*.md\"",
    "create-api-json": "node script/create-api-json.js",
    "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
    "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
@@ -136,7 +135,7 @@
    ],
    "docs/api/**/*.md": [
      "ts-node script/gen-filenames.ts",
-      "markdownlint-cli2 --config .autofix.markdownlint-cli2.jsonc --fix",
+      "electron-markdownlint --config .markdownlint.autofix.json --fix",
      "git add filenames.auto.gni"
    ],
    "{*.patch,.patches}": [
--- a/patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch
+++ b/patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch
@@ -20,10 +20,10 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57
 
     case ssl_open_record_error:
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index 206a01640d31b61752795325b70bc5f1640cd3a1..0d6519f604cd363f4065fa52a87d29bca451f05c 100644
+index ec0ee893e58d49890f5545d02b533d07e362309c..b1c1a77c340e7d2c9e2ef21fcf0cc01ed6e15cc0 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
-@@ -1336,7 +1336,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
+@@ -1340,7 +1340,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
   }
 
   if (ret_code == 0) {
@@ -32,7 +32,7 @@ index 206a01640d31b61752795325b70bc5f1640cd3a1..0d6519f604cd363f4065fa52a87d29bc
       return SSL_ERROR_ZERO_RETURN;
     }
     // An EOF was observed which violates the protocol, and the underlying
-@@ -2718,13 +2718,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
+@@ -2707,13 +2707,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
   return CRYPTO_get_ex_data(&ctx->ex_data, idx);
 }
 
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -1,5 +1,6 @@
 build_gn.patch
 accelerator.patch
+blink_file_path.patch
 blink_local_frame.patch
 can_create_window.patch
 disable_hidden.patch
@@ -128,5 +129,5 @@ partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
 feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
 fix_font_face_resolution_when_renderer_is_blocked.patch
 feat_enable_passing_exit_code_on_service_process_crash.patch
-chore_remove_reference_to_chrome_browser_themes.patch
+x11_use_localized_display_label_only_for_browser_process.patch
 feat_enable_customizing_symbol_color_in_framecaptionbutton.patch
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= and Ctrl-Plus show up as such

 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 6d373509a7b392f4e0066260da609b0c7503708b..d9445b90dba8f5d7372cd49ae92c2d28f719f288 100644
+index 3094f8f1b445b639f43573af6f6b5ae5eddf7227..7c8e781cf1502bdb72ffc9f2d7ab2be684f37d5c 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
@@ -12,6 +12,7 @@
@@ -21,7 +21,7 @@ index 6d373509a7b392f4e0066260da609b0c7503708b..d9445b90dba8f5d7372cd49ae92c2d28
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
-@@ -184,6 +185,11 @@ std::u16string Accelerator::GetShortcutText() const {
+@@ -183,6 +184,11 @@ std::u16string Accelerator::GetShortcutText() const {
 #endif
 
   if (shortcut.empty()) {
@@ -33,7 +33,7 @@ index 6d373509a7b392f4e0066260da609b0c7503708b..d9445b90dba8f5d7372cd49ae92c2d28
 #if BUILDFLAG(IS_WIN)
     // Our fallback is to try translate the key code to a regular character
     // unless it is one of digits (VK_0 to VK_9). Some keyboard
-@@ -207,6 +213,10 @@ std::u16string Accelerator::GetShortcutText() const {
+@@ -206,6 +212,10 @@ std::u16string Accelerator::GetShortcutText() const {
       shortcut +=
           static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
 #endif
@@ -44,7 +44,7 @@ index 6d373509a7b392f4e0066260da609b0c7503708b..d9445b90dba8f5d7372cd49ae92c2d28
   }
 
 #if BUILDFLAG(IS_MAC)
-@@ -391,7 +401,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -390,7 +400,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
     const std::u16string& shortcut) const {
   std::u16string result = shortcut;
 
@@ -53,7 +53,7 @@ index 6d373509a7b392f4e0066260da609b0c7503708b..d9445b90dba8f5d7372cd49ae92c2d28
     result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
 
   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
-@@ -399,7 +409,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -398,7 +408,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
   // more information.
   if (IsCtrlDown())
     result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.

 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index b9651dfe19ecbdeb582e289a7fb69a8527a42be0..3ed36ff5ee743aec335d194eefb02e12b9a11be1 100644
+index bb019363bf40f8f2df7815353784c357254c0132..e994a0e7bbef2f78c642486e84aa0386cab7f794 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -257,6 +257,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -264,6 +264,10 @@ int GpuMain(MainFunctionParams parameters) {
   // to the GpuProcessHost once the GpuServiceImpl has started.
   viz::GpuServiceImpl::InstallPreInitializeLogHandler();
 
@@ -24,7 +24,7 @@ index b9651dfe19ecbdeb582e289a7fb69a8527a42be0..3ed36ff5ee743aec335d194eefb02e12
   // We are experiencing what appear to be memory-stomp issues in the GPU
   // process. These issues seem to be impacting the task executor and listeners
   // registered to it. Create the task executor on the heap to guard against
-@@ -355,7 +359,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -362,7 +366,6 @@ int GpuMain(MainFunctionParams parameters) {
 #endif
   const bool dead_on_arrival = !init_success;
 
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.

 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index c313c0342f0e470db13a4c95473decbc8dbdcbd3..10c6596a8cd06aebf19b4302a60eb78eb09f29de 100644
+index 902d84ad70adc9496f3af989465a99b6f44b077a..3ce043eea32c41130aa59ab8570a05b31fdb4de9 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -145,6 +145,8 @@ class CONTENT_EXPORT RenderFrameObserver
+@@ -146,6 +146,8 @@ class CONTENT_EXPORT RenderFrameObserver
   virtual void DidHandleOnloadEvents() {}
   virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                       int32_t world_id) {}
@@ -23,10 +23,10 @@ index c313c0342f0e470db13a4c95473decbc8dbdcbd3..10c6596a8cd06aebf19b4302a60eb78e
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index d833b71a88e91b128236233323fdf6c3d2972f9f..5b6c4847a1d14cb5e092b065be733f0a2a088046 100644
+index 2d7d13fc9f361bc3e4b16e4db008c042f492704a..dc96cd01365491a2384e9d27e384b680c3e86a23 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4689,6 +4689,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4692,6 +4692,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
@@ -40,10 +40,10 @@ index d833b71a88e91b128236233323fdf6c3d2972f9f..5b6c4847a1d14cb5e092b065be733f0a
                                                int world_id) {
   for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 7dff22180ef00c04ef1291929448d5fe8c1bb79a..1b611f429beac2de78f3ae9e3cbedc94e7793dc0 100644
+index b4e2293651bb0e234aa8119c2afece5faa11a758..37af654883ec39c761cc4fcaab9d22061595d451 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -643,6 +643,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -645,6 +645,8 @@ class CONTENT_EXPORT RenderFrameImpl
   void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
   void DidCreateScriptContext(v8::Local<v8::Context> context,
                               int world_id) override;
@@ -53,10 +53,10 @@ index 7dff22180ef00c04ef1291929448d5fe8c1bb79a..1b611f429beac2de78f3ae9e3cbedc94
                                 int world_id) override;
   void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 5bedd97cb999b3bf063b2cf46d95b655ac35afb4..4f5b7f661f11629602454d2f295a806fb7d63b70 100644
+index 2bb6e24cf5b83b8f6cf523d648307608ede1b538..1fe4df62e66fd10267e72d91176529fccabe83aa 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -647,6 +647,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -645,6 +645,9 @@ class BLINK_EXPORT WebLocalFrameClient {
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) {}
 
@@ -67,10 +67,10 @@ index 5bedd97cb999b3bf063b2cf46d95b655ac35afb4..4f5b7f661f11629602454d2f295a806f
   virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                         int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index f7e0144c74f879e9b29871d7c372b99e127966bb..c3cd7b77ed282f212a56d151dc3fbec36d183701 100644
+index 50352340def787f5c6a382b622c37905ee79302c..97a79a4bfbcdd63ec01b201571fdccf2701ae40b 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
-@@ -217,6 +217,7 @@ void LocalWindowProxy::Initialize() {
+@@ -215,6 +215,7 @@ void LocalWindowProxy::Initialize() {
   }
 
   InstallConditionalFeatures();
@@ -79,10 +79,10 @@ index f7e0144c74f879e9b29871d7c372b99e127966bb..c3cd7b77ed282f212a56d151dc3fbec3
   if (World().IsMainWorld()) {
     probe::DidCreateMainWorldContext(GetFrame());
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index bb419323dd6afd6070fcee909672344beaf63322..98894c5e14ba97a93ec305da173c4cf312d1d531 100644
+index 69c46beec12f4b5abf530c2fb836d6185ee049f9..e9c0f5c0930929a5f62a34943f7619a368c551e1 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -306,6 +306,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
 
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) = 0;
@@ -92,10 +92,10 @@ index bb419323dd6afd6070fcee909672344beaf63322..98894c5e14ba97a93ec305da173c4cf3
                                         int32_t world_id) = 0;
   virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 47336f7596d7cdae9f78278f42fce07e1d86bba0..fcbddc3c13a5298dffea5c8ad87be02d60be52b2 100644
+index 0cee9fc9642c4a2eac51cc7b57124d9772411b8c..4a2bd06f9f254969419d3ec00a59466f8278814c 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-@@ -294,6 +294,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
+@@ -293,6 +293,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
     web_frame_->Client()->DidCreateScriptContext(context, world_id);
 }
 
@@ -110,10 +110,10 @@ index 47336f7596d7cdae9f78278f42fce07e1d86bba0..fcbddc3c13a5298dffea5c8ad87be02d
     v8::Local<v8::Context> context,
     int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 1ea7ea4a054bea4711eeb6da14b83f54f7527cb1..ee3048b311f35483fd57bead855e3618a4d37cca 100644
+index a70c4a78a3dc740446b06a44a448760015bc9c24..be9872bdd93755bbf9e2be684cfd37efe9f4a5a8 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-@@ -83,6 +83,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
+@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
 
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int32_t world_id) override;
@@ -123,7 +123,7 @@ index 1ea7ea4a054bea4711eeb6da14b83f54f7527cb1..ee3048b311f35483fd57bead855e3618
                                 int32_t world_id) override;
 
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index d4e7bbc860b9cc2c27cdd8393a184e90d44214b9..66a37e0b6bcfe9714c1a11d76aa1789ccfc3862f 100644
+index ec2a8f7d2fc14702686be73e663dfb9632b5b4de..5f3fdd7d03b81c7bf59528af96c550d9f2307835 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -412,6 +412,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
--- a/patches/chromium/add_electron_deps_to_license_credits_file.patch
+++ b/patches/chromium/add_electron_deps_to_license_credits_file.patch
@@ -7,10 +7,10 @@ Ensure that licenses for the dependencies introduced by Electron
 are included in `LICENSES.chromium.html`

 diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
-index c64e1fadc4474051a6981c83300f64fdbeb64cc0..e3ca127e39a2b69b97941293a13bd41b3cf763d6 100755
+index f3a8ba3756a19beb286a3f7bba52399705bf59bf..7cf72db56d3bc71cf6fb2b3f88a80e7866db1598 100755
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -335,6 +335,31 @@ SPECIAL_CASES = {
+@@ -336,6 +336,31 @@ SPECIAL_CASES = {
         "License": "Apache 2.0",
         "License File": ["//third_party/dawn/third_party/khronos/LICENSE"],
     },
--- a/patches/chromium/add_gin_converter_support_for_arraybufferview.patch
+++ b/patches/chromium/add_gin_converter_support_for_arraybufferview.patch
@@ -39,7 +39,7 @@ index 62209cadaec7314d2d4ec3e63e1bc88394afa4a9..b035bfe1fd16fb6ca8be33bf446ff857
                                               Local<External> val) {
   return val.As<Value>();
 diff --git a/gin/converter.h b/gin/converter.h
-index 37b528f24785ee330b507e33bcdfaeb09a3ed594..76802f6d06b551f9fad0196fadae2aaf748a32cc 100644
+index 828e59f4640e84ae9e4517b9ed9bc13b154fa9f2..c3d97c4e46fe47076299e475be7eec74cbc5783c 100644
 --- a/gin/converter.h
 +++ b/gin/converter.h
@@ -190,6 +190,15 @@ struct GIN_EXPORT Converter<v8::Local<v8::ArrayBuffer> > {
--- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
@@ -8,10 +8,10 @@ decorations in maximized mode where needed, preventing empty space caused
 by decoration shadows and rounded titlebars around the window while maximized.

 diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
-index ca2fc0b1b3fe9f7fd65f55f8924b4b5e324bfdd4..da8ebfad6404c59471dc31625aeb4e68659116a3 100644
+index 7b81a752ffad229a7bf1917f000b7a45f0828c36..1f08396713155eafc78a1fa9fc8fec22df350a91 100644
 --- a/ui/gtk/gtk_ui.cc
 +++ b/ui/gtk/gtk_ui.cc
-@@ -577,11 +577,12 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
+@@ -562,11 +562,12 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
 }
 
 ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame,
@@ -28,11 +28,11 @@ index ca2fc0b1b3fe9f7fd65f55f8924b4b5e324bfdd4..da8ebfad6404c59471dc31625aeb4e68
   return provider.get();
 }
 diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
-index 32051374590fc1179e5cfa21ebc34474d2ce0190..09e9399a67d30d4686f4c141050538b8dde9f301 100644
+index 0432ea4f5906502a4f6def46ab064292a6628218..e3cbfa3a1ac8c169c429e29c1262d0dd2a05a4b6 100644
 --- a/ui/gtk/gtk_ui.h
 +++ b/ui/gtk/gtk_ui.h
-@@ -110,7 +110,8 @@ class GtkUi : public ui::LinuxUiAndTheme {
-   void SetAccentColor(std::optional<SkColor> accent_color) override;
+@@ -107,7 +107,8 @@ class GtkUi : public ui::LinuxUiAndTheme {
+   void SetDarkTheme(bool dark) override;
   std::unique_ptr<ui::NavButtonProvider> CreateNavButtonProvider() override;
   ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame,
 -                                                  bool tiled) override;
@@ -41,7 +41,7 @@ index 32051374590fc1179e5cfa21ebc34474d2ce0190..09e9399a67d30d4686f4c141050538b8
 
  private:
   using TintMap = std::map<int, color_utils::HSL>;
-@@ -199,7 +200,7 @@ class GtkUi : public ui::LinuxUiAndTheme {
+@@ -191,7 +192,7 @@ class GtkUi : public ui::LinuxUiAndTheme {
   // while Chrome is running.  This 2D array is indexed first by whether the
   // frame is translucent (0) or solid(1), then by whether the frame is normal
   // (0) or tiled (1).
@@ -51,10 +51,10 @@ index 32051374590fc1179e5cfa21ebc34474d2ce0190..09e9399a67d30d4686f4c141050538b8
   // Objects to notify when the window frame button order changes.
   base::ObserverList<ui::WindowButtonOrderObserver>::Unchecked
 diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc
-index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded245803410ccb5d4 100644
+index 0b8fa0ec76098e0319b2e853719166d405cd3828..52615c5c119c58f17850454e98d1240b141e8a09 100644
 --- a/ui/gtk/window_frame_provider_gtk.cc
 +++ b/ui/gtk/window_frame_provider_gtk.cc
-@@ -29,20 +29,23 @@ constexpr int kMaxFrameSizeDip = 64;
+@@ -30,20 +30,23 @@ constexpr int kMaxFrameSizeDip = 64;
 // will get an incorrect hint as to which pixels are fully opaque.
 constexpr int kMaxCornerRadiusDip = 32;
 
@@ -81,7 +81,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   // GTK4 renders the decoration directly on the window.
   if (!GtkCheckVersion(4)) {
     context = AppendCssNodeToStyleContext(context, "decoration");
-@@ -61,8 +64,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool tiled, bool focused) {
+@@ -62,8 +65,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool tiled, bool focused) {
   return context;
 }
 
@@ -92,7 +92,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   context =
       AppendCssNodeToStyleContext(context, "headerbar.header-bar.titlebar");
   if (!focused) {
-@@ -117,8 +120,8 @@ int ComputeTopCornerRadius() {
+@@ -120,8 +123,8 @@ int ComputeTopCornerRadius() {
   // need to experimentally determine the corner radius by rendering a sample.
   // Additionally, in GTK4, the headerbar corners get clipped by the window
   // rather than the headerbar having its own rounded corners.
@@ -103,7 +103,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   ApplyCssToContext(context, R"(window, headerbar {
     background-image: none;
     background-color: black;
-@@ -152,7 +155,7 @@ int ComputeTopCornerRadius() {
+@@ -155,7 +158,7 @@ int ComputeTopCornerRadius() {
 bool HeaderIsTranslucent() {
   // The arbitrary square size to render a sample header.
   constexpr int kHeaderSize = 32;
@@ -112,7 +112,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   double opacity = GetOpacityFromContext(context);
   if (opacity < 1.0) {
     return true;
-@@ -186,8 +189,8 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::Asset::operator=(
+@@ -189,8 +192,8 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::Asset::operator=(
 
 WindowFrameProviderGtk::Asset::~Asset() = default;
 
@@ -123,7 +123,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   GtkSettings* settings = gtk_settings_get_default();
   // Unretained() is safe since WindowFrameProviderGtk will own the signals.
   auto callback = base::BindRepeating(&WindowFrameProviderGtk::OnThemeChanged,
-@@ -337,7 +340,7 @@ void WindowFrameProviderGtk::PaintWindowFrame(gfx::Canvas* canvas,
+@@ -340,7 +343,7 @@ void WindowFrameProviderGtk::PaintWindowFrame(gfx::Canvas* canvas,
 
   auto header =
       PaintHeaderbar({client_bounds_px.width(), top_area_height_px},
@@ -132,7 +132,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   image = gfx::ImageSkia::CreateFrom1xBitmap(header);
   // In GTK4, the headerbar gets clipped by the window.
   if (GtkCheckVersion(4)) {
-@@ -366,7 +369,7 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::GetOrCreateAsset(
+@@ -369,7 +372,7 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::GetOrCreateAsset(
 
   gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip,
                              2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip);
@@ -141,7 +141,7 @@ index e24cce85b453ecee9a4854bfdf7b8eeb6814f8c3..d3e3e9b918011c433b4ac6ded2458034
   frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context));
   frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context));
   gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset));
-@@ -374,7 +377,7 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::GetOrCreateAsset(
+@@ -377,7 +380,7 @@ WindowFrameProviderGtk::Asset& WindowFrameProviderGtk::GetOrCreateAsset(
                                      focused_context, scale);
   asset.unfocused_bitmap =
       PaintBitmap(bitmap_size, gfx::RectF(frame_bounds_dip),
@@ -173,10 +173,10 @@ index 4faaae32a203bfa57f3e61c391dc6917c4a0bf59..94050a0136b78730f607f42991742e04
   // Scale-independent metric calculated based on the bitmaps.
   std::optional<gfx::Insets> frame_thickness_dip_;
 diff --git a/ui/linux/fallback_linux_ui.cc b/ui/linux/fallback_linux_ui.cc
-index e4a7f8eb0ef8bacd2d4e4231d0990b4a01021626..3477542587b08691c164941b2c2e3b22050231ca 100644
+index 8903f9ba950e7878fbd1bfa0cf2a42e0cc9daa21..7d13381eb1d16193bad0be1318e8ed199c6fb845 100644
 --- a/ui/linux/fallback_linux_ui.cc
 +++ b/ui/linux/fallback_linux_ui.cc
-@@ -143,7 +143,8 @@ FallbackLinuxUi::CreateNavButtonProvider() {
+@@ -141,7 +141,8 @@ FallbackLinuxUi::CreateNavButtonProvider() {
 
 ui::WindowFrameProvider* FallbackLinuxUi::GetWindowFrameProvider(
     bool solid_frame,
@@ -187,11 +187,11 @@ index e4a7f8eb0ef8bacd2d4e4231d0990b4a01021626..3477542587b08691c164941b2c2e3b22
 }
 
 diff --git a/ui/linux/fallback_linux_ui.h b/ui/linux/fallback_linux_ui.h
-index 0800349bc18753e6a41a938c70213dd7dd123d0d..a1553e0cb1fac188fb2c74e10163c52dead02f29 100644
+index 2612cb68984a8435c84f0b0592eda8a5df6dd91e..282b48038f83d4a6dafe734f639d994c245c67ac 100644
 --- a/ui/linux/fallback_linux_ui.h
 +++ b/ui/linux/fallback_linux_ui.h
-@@ -67,7 +67,8 @@ class FallbackLinuxUi : public LinuxUiAndTheme {
-   void SetAccentColor(std::optional<SkColor> accent_color) override;
+@@ -66,7 +66,8 @@ class FallbackLinuxUi : public LinuxUiAndTheme {
+   void SetDarkTheme(bool dark) override;
   std::unique_ptr<ui::NavButtonProvider> CreateNavButtonProvider() override;
   ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame,
 -                                                  bool tiled) override;
@@ -201,10 +201,10 @@ index 0800349bc18753e6a41a938c70213dd7dd123d0d..a1553e0cb1fac188fb2c74e10163c52d
  private:
   std::optional<gfx::FontRenderParams> default_font_render_params_;
 diff --git a/ui/linux/linux_ui.h b/ui/linux/linux_ui.h
-index 0a4c394b07a682d55639f37414331d68f175841c..45db96c165d61f551b344c7c852c083546508325 100644
+index b940382678ba70debaf7f33698c0b8bd02c42c4e..4477a1012fef5ad6dd365d70d28eadd3db136ceb 100644
 --- a/ui/linux/linux_ui.h
 +++ b/ui/linux/linux_ui.h
-@@ -307,7 +307,8 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUiTheme {
+@@ -304,7 +304,8 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUiTheme {
   // The returned object is not owned by the caller and will remain alive until
   // the process ends.
   virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame,
--- a/patches/chromium/adjust_accessibility_ui_for_electron.patch
+++ b/patches/chromium/adjust_accessibility_ui_for_electron.patch
@@ -10,7 +10,7 @@ usage of BrowserList and Browser as we subclass related methods and use our
 WindowList.

 diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
-index 8bf96dc519e1479d8986ff81c3c81641e5e7c58b..a2b70a26febcebedc125c4c83b662b3c77cb428b 100644
+index aff8a187b6d81172bf5930c6da6bfed4d7989057..5923e39ae94cabd716d845c86db5f84c3c51e2cb 100644
 --- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
@@ -43,6 +43,7 @@
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,7 +6,7 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.

 diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
-index b5934f99861b11afe1b695ac25886ee0d059d0ab..419f823a094c1b163d7a5b441f1b034c0dada66b 100644
+index 1eb0f9919a29acf9f443f15ef5e7549138d73f7b..070ad96c753bc064c1af48a934a7a3bc7483174b 100644
 --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
@@ -163,6 +163,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
@@ -23,10 +23,10 @@ index b5934f99861b11afe1b695ac25886ee0d059d0ab..419f823a094c1b163d7a5b441f1b034c
     return receiver_.BindNewEndpointAndPassDedicatedRemote();
   }
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index c398dc84de605c7feef92fda30b25297a12273b0..747d5d9e09c4c002a5f38483ef0022d263cddbe6 100644
+index d39f6f582109e7323372c032048544738372cf41..9ba70f021fd72e5861566e89f40af3edf4dea7e1 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -737,6 +737,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -713,6 +713,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
   GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
 }
 
@@ -39,7 +39,7 @@ index c398dc84de605c7feef92fda30b25297a12273b0..747d5d9e09c4c002a5f38483ef0022d2
   return is_active();
 }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 779e90581cdfb2d1bdd904da038f7537d0477f5a..c85620ac2f30998d1b67f159e50ee72221bf0dad 100644
+index 5b4e90e2a9293f6d59e92b16bd461500f8188cc7..b69f66e5cf009a340766c355d9ceea89a20546b2 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -139,6 +139,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@@ -51,10 +51,10 @@ index 779e90581cdfb2d1bdd904da038f7537d0477f5a..c85620ac2f30998d1b67f159e50ee722
   void SendRendererPreferencesToRenderer(
       const blink::RendererPreferences& preferences);
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 07a0a672b51fe67083159a4133b0c36991092f00..a9719e074f750e955982f2f25bfbfb37f5d2f861 100644
+index 86c755796f215d3655648af4fa7a6e4eaabd109a..3c9b0864b2b96f6103b0661db3488e970b2886e1 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -580,8 +580,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
+@@ -570,8 +570,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
   // OnShowWithPageVisibility will not call NotifyHostAndDelegateOnWasShown,
   // which updates `visibility_`, unless the host is hidden. Make sure no update
   // is needed.
@@ -92,7 +92,7 @@ index 603798ae0d45836f1bf3e6608761ce1467303310..2d8caa06e418f123d7565b96d40c66fb
   mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
 };
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index c980f3f76a37a4207bb54f18fbcdb8d0950c8856..91a9dfe56fbbcd1cc873add438947dd29c7e6646 100644
+index ed73a6fe6d146eac904f0aa0d88facf055df503e..4bbc792068db75739a7ceb8ad01c85f9d3bbd8f6 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
@@ -173,4 +173,7 @@ interface PageBroadcast {
@@ -104,10 +104,10 @@ index c980f3f76a37a4207bb54f18fbcdb8d0950c8856..91a9dfe56fbbcd1cc873add438947dd2
 +  SetSchedulerThrottling(bool allowed);
 };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 4220a0aebf4a2ce3d62f76c441b6ec1b5e11ffa1..6ea17602d2b186b81cf7dc69750bd302ff717aea 100644
+index 6dfc5bef7ed4197067f63db2e12de9b1e1478e2e..ab8eb5352a18c514d864d6fd7c64a61e571dce3e 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -362,6 +362,7 @@ class BLINK_EXPORT WebView {
+@@ -376,6 +376,7 @@ class BLINK_EXPORT WebView {
   // Scheduling -----------------------------------------------------------
 
   virtual PageScheduler* Scheduler() const = 0;
@@ -116,10 +116,10 @@ index 4220a0aebf4a2ce3d62f76c441b6ec1b5e11ffa1..6ea17602d2b186b81cf7dc69750bd302
   // Visibility -----------------------------------------------------------
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 36bd7ee7ed789981d3e6733d5f869430a1112a6f..831b3b1ee47a88b6b02a2256682e4a9b1cbeda3c 100644
+index 173ca5a588d8b9525bd835207358007c120120b0..8db4b77dc968a6f8dd4612deecb7b4ce5ee71eb4 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -2461,6 +2461,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
+@@ -2430,6 +2430,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
   TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
                "old_state", old_state, "new_state", new_state);
 
@@ -130,7 +130,7 @@ index 36bd7ee7ed789981d3e6733d5f869430a1112a6f..831b3b1ee47a88b6b02a2256682e4a9b
   bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
                             !old_state->is_in_back_forward_cache;
   bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
-@@ -3974,10 +3978,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3940,10 +3944,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
   return GetPage()->GetPageScheduler();
 }
 
@@ -155,10 +155,10 @@ index 36bd7ee7ed789981d3e6733d5f869430a1112a6f..831b3b1ee47a88b6b02a2256682e4a9b
   // Do not throttle if the page should be painting.
   bool is_visible =
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 764d48e8fc89fa0b95e01881c2f5462e385ed8d5..c0e99aec75858ec00a57d4b4484cbc719dbdda88 100644
+index d6bfd9b670d03170c2c388bb69b2299ef3fe2286..8684fd118320d26549dbc7d0c5bdbbb4d081e0a3 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -449,6 +449,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -451,6 +451,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   LocalDOMWindow* PagePopupWindow() const;
 
   PageScheduler* Scheduler() const override;
@@ -166,7 +166,7 @@ index 764d48e8fc89fa0b95e01881c2f5462e385ed8d5..c0e99aec75858ec00a57d4b4484cbc71
   void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                           bool is_initial_state) override;
   mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -930,6 +931,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -927,6 +928,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   // If true, we send IPC messages when |preferred_size_| changes.
   bool send_preferred_size_changes_ = false;
 
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,7 +8,7 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.

 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index a93c0d81eb4fde2e85d0a56852b0a3a147b82039..7025e7ce57fbd0183933eed7f670ad23f2e00e51 100644
+index 2eb418015552910f6a5bceb117953a563e3b8c07..9974a94a6ae78f36e7baab097e710a79f817e682 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -147,6 +147,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -32,7 +32,7 @@ index a93c0d81eb4fde2e85d0a56852b0a3a147b82039..7025e7ce57fbd0183933eed7f670ad23
   out->accelerated_video_decode_enabled =
       data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f4a0d0b79 100644
+index a928196b83671b7f9a6fc27f2a8436c89fe3d3e5..ef5ba7b733bfa67158cb631b5b0bb6b28ba8758d 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -10,6 +10,7 @@
@@ -43,7 +43,7 @@ index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/blink/public/common/common_export.h"
 #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -441,6 +442,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -432,6 +433,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
   // blocking user's access to the background web content.
   bool modal_context_menu = true;
 
@@ -65,7 +65,7 @@ index 2c2dbbefe0450be58fcd484e45d8e79f3dd29971..a9dab859899b8ff7dba0e6e5a34da15f
   // chrome, except for the cases where it would require lots of extra work for
   // the embedder to use the same default value.
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index cdffdae3ec7fe010f9850a4a020eb1a49116cc58..4ef26a1695779564e943609314ee7ca06f423819 100644
+index ffddf92b78f1bc03f40969bb93260502b0887e8a..7a8f75cb6b501b90df7a1fec2b5a84667250691c 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -6,6 +6,7 @@
@@ -130,7 +130,7 @@ index cdffdae3ec7fe010f9850a4a020eb1a49116cc58..4ef26a1695779564e943609314ee7ca0
     return r.cookie_enabled;
   }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 5560f0ff45342b806e89ab42a8f5f479f1946ad5..7bd5f65ef39988e3b08fd342c56c5f7f90f105c5 100644
+index 2dc2c857784ce482c7437a39e3e12f9a1d15bc55..fd6cf5ca4fbb22450da2c9677dfa806ab3f2aeb9 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976

 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46a1540e06 100644
+index bd42c5630ccf051ae16319ef2659784a4d9ec84c..57c295a242274e5e95e8ee258c68fd99dbe52524 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
@@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
@@ -33,7 +33,7 @@ index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46
 void SimpleMenuModel::SetMinorText(size_t index,
                                    const std::u16string& minor_text) {
   items_[ValidateItemIndex(index)].minor_text = minor_text;
-@@ -429,6 +439,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
+@@ -428,6 +438,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
   return items_[ValidateItemIndex(index)].label;
 }
 
@@ -47,10 +47,10 @@ index 88e27362452e5e3563d45fbf445bead98f49cb26..dff17f273e8767f85a73c3a5eeb27f46
   return items_[ValidateItemIndex(index)].minor_text;
 }
 diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
-index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad635d12a6 100644
+index 91aed90678dfc9c78c795dfd69877acd796f5179..ffe5c34486e656df49652771ef2a58829ffe3591 100644
 --- a/ui/base/models/simple_menu_model.h
 +++ b/ui/base/models/simple_menu_model.h
-@@ -99,6 +99,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -55,6 +55,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
     // Some command ids have labels and icons that change over time.
     virtual bool IsItemForCommandIdDynamic(int command_id) const;
     virtual std::u16string GetLabelForCommandId(int command_id) const;
@@ -58,7 +58,7 @@ index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad
     // Gets the icon for the item with the specified id.
     virtual ImageModel GetIconForCommandId(int command_id) const;
 
-@@ -218,6 +219,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -174,6 +175,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
   // Sets the label for the item at |index|.
   void SetLabel(size_t index, const std::u16string& label);
 
@@ -68,7 +68,7 @@ index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad
   // Sets the minor text for the item at |index|.
   void SetMinorText(size_t index, const std::u16string& minor_text);
 
-@@ -260,6 +264,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -216,6 +220,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
   ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override;
   int GetCommandIdAt(size_t index) const override;
   std::u16string GetLabelAt(size_t index) const override;
@@ -76,7 +76,7 @@ index 80980d910ab77656351368944b6c4f5bb6aeded2..76a4bb7441faa46a672589985429a2ad
   std::u16string GetMinorTextAt(size_t index) const override;
   ImageModel GetMinorIconAt(size_t index) const override;
   bool IsItemDynamicAt(size_t index) const override;
-@@ -299,6 +304,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -255,6 +260,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
     int command_id = 0;
     ItemType type = TYPE_COMMAND;
     std::u16string label;
--- a/patches/chromium/blink_file_path.patch
+++ b/patches/chromium/blink_file_path.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Thu, 20 Sep 2018 17:45:00 -0700
+Subject: blink_file_path.patch
+
+This is used by editors to obtain the filesystem path from a dragged file. See
+documentation at https://electronjs.org/docs/api/file-object
+
+diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
+index 3b120f0de6dcd7e584a7882df9ece2a7adcbc368..01b5f3391abb0d8ff76c427fa187f9d6d2523919 100644
+--- a/third_party/blink/renderer/core/fileapi/file.h
+++ b/third_party/blink/renderer/core/fileapi/file.h
+@@ -220,6 +220,9 @@ class CORE_EXPORT File final : public Blob {
+   }
+   const String& name() const { return name_; }
+ 
+  // Getter for the path IDL attribute.
+  const String& path() const { return GetPath(); }
+
+   // Getter for the lastModified IDL attribute,
+   // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
+   // This method calls CaptureSnapshotIfNeeded, and thus can involve synchronous
+diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
+index 4339a27e87c12279b2a2f08a7c3d181e7265a986..6aebb1ba4f74a4cfdc546fe5903032f4bc23dd30 100644
+--- a/third_party/blink/renderer/core/fileapi/file.idl
+++ b/third_party/blink/renderer/core/fileapi/file.idl
+@@ -31,6 +31,7 @@
+ ] interface File : Blob {
+     [CallWith=ExecutionContext] constructor(sequence<BlobPart> fileBits, USVString fileName, optional FilePropertyBag options = {});
+     readonly attribute DOMString name;
+    readonly attribute DOMString path;
+     readonly attribute long long lastModified;
+ 
+     // Non-standard APIs
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.

 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 313b9756ba3b28c26baa408088fe9cec9bcfa283..96e8579d1be764bb4aac9ef82e6ede192977961d 100644
+index 0e21d9c3194198e7540c7b3a84e8aed691821cbb..c0f5d92f8613ca380295cca7f55456d6fbcd6d1f 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -130,14 +130,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -125,14 +125,6 @@ bool Frame::Detach(FrameDetachType type) {
 
   DCHECK(!IsDetached());
 
@@ -33,7 +33,7 @@ index 313b9756ba3b28c26baa408088fe9cec9bcfa283..96e8579d1be764bb4aac9ef82e6ede19
   if (type == FrameDetachType::kRemove) {
     if (provisional_frame_) {
       provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -161,6 +153,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -156,6 +148,14 @@ bool Frame::Detach(FrameDetachType type) {
     GetWindowProxyManager()->ClearForSwap();
   }
 
@@ -49,10 +49,10 @@ index 313b9756ba3b28c26baa408088fe9cec9bcfa283..96e8579d1be764bb4aac9ef82e6ede19
   // its owning reference back to our owning LocalFrame.
   client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 496493cb923583164a73364ed1ac0a57a4fad6b2..4357c005f9b731566451b31d133d441f084a1c86 100644
+index 50edd8bfdb5a6ec6de8d324c7cec09655d8761d1..1b3ee460f8571602c8d1fc22e709ce44d6095d7a 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -733,10 +733,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -718,10 +718,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   }
   DCHECK(!view_ || !view_->IsAttached());
 
@@ -63,7 +63,7 @@ index 496493cb923583164a73364ed1ac0a57a4fad6b2..4357c005f9b731566451b31d133d441f
   if (!Client())
     return false;
 
-@@ -788,6 +784,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -772,6 +768,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   DCHECK(!view_->IsAttached());
   Client()->WillBeDetached();
 
--- a/patches/chromium/boringssl_build_gn.patch
+++ b/patches/chromium/boringssl_build_gn.patch
@@ -6,10 +6,10 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.

 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index f44ece00734c090aecdd302fd78895416e70c996..05c52201a1c15946a9172521507c58749dada304 100644
+index f1b4a1ac248479746a378c85e34845b7703d5867..727940b7c015bedb0a09c06123d9e12cbb039694 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
-@@ -48,6 +48,21 @@ config("no_asm_config") {
+@@ -52,6 +52,21 @@ config("no_asm_config") {
 all_sources = crypto_sources + ssl_sources + pki_sources + pki_internal_headers
 all_headers = crypto_headers + ssl_headers + pki_headers + pki_internal_headers
 
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,10 +8,10 @@ categories in use are known / declared.  This patch is required for us
 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 560313ed41ea00c756126599252089c9bd468025..869e0492dbaed74fd086b6be3be525423fac3c42 100644
+index 4c1a949117a070a74285d043ec89a677952fd2c4..a62476b75142705c01c7d2260c93fa7b4342a2b6 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -88,6 +88,7 @@
+@@ -87,6 +87,7 @@
   X("drm")                                                               \
   X("drmcursor")                                                         \
   X("dwrite")                                                            \
--- a/patches/chromium/build_allow_electron_to_use_exec_script.patch
+++ b/patches/chromium/build_allow_electron_to_use_exec_script.patch
@@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script
 This is similar to the //build usecase so we're OK adding ourselves here

 diff --git a/.gn b/.gn
-index 44a11ec90ec9b67cf22b6d529c6843e6b6af12bc..783dd77dcdf92ec32cc6594b739eab9738f3e3ba 100644
+index e6f5cbc9c49f998d63dc8974c5b4789643b2fc87..1df4bbe26fe90eef2dc1a73faaff3c2405993491 100644
 --- a/.gn
 +++ b/.gn
-@@ -172,4 +172,8 @@ exec_script_whitelist =
+@@ -169,4 +169,8 @@ exec_script_whitelist =
 
       "//tools/grit/grit_rule.gni",
       "//tools/gritsettings/BUILD.gn",
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.

 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 7ef8050aa89bb4132680c6d00d5d6ab3ecfdc713..bcf823da79171196447708b12c6bfd15cb15774b 100644
+index c13bf8667c6996ec8ad4a3149993b266cea446bf..da2704e283bbaad9110ca57fb5bef786362c224e 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -192,11 +192,16 @@ if (!is_android && !is_mac) {
+@@ -189,11 +189,16 @@ if (!is_android && !is_mac) {
           "common/crash_keys.h",
         ]
 
@@ -33,10 +33,10 @@ index 7ef8050aa89bb4132680c6d00d5d6ab3ecfdc713..bcf823da79171196447708b12c6bfd15
           "//base",
           "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 7c6e3dea2fa88880dbdcefa8e10457d1c330566a..2506e200e5574cd220dd2716325bffb78a61a8b3 100644
+index 0be27cd41b86673d7c8a4a8d7211a19ad8c8e36c..e67d70e81cbad7520616e5d19565d59dde1491c2 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4767,7 +4767,7 @@ static_library("browser") {
+@@ -4926,7 +4926,7 @@ static_library("browser") {
 
     # On Windows, the hashes are embedded in //chrome:chrome_initial rather
     # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 7c6e3dea2fa88880dbdcefa8e10457d1c330566a..2506e200e5574cd220dd2716325bffb7
       sources += [ "certificate_viewer_stub.cc" ]
     }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 86a3b56421319fb175a4a16ee885a53240a206a2..c4b78153010b4b1433dc9196f9f10a8ae49bfcf7 100644
+index 6870df1cee3431d979f2a729316d6449dbf1bea5..b049528a981b1353d0092b4f8e5cc5ab8ed4e17b 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7203,9 +7203,12 @@ test("unit_tests") {
+@@ -7317,9 +7317,12 @@ test("unit_tests") {
       "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
     ]
 
@@ -63,7 +63,7 @@ index 86a3b56421319fb175a4a16ee885a53240a206a2..c4b78153010b4b1433dc9196f9f10a8a
       "//chrome//services/util_win:unit_tests",
       "//chrome/app:chrome_dll_resources",
       "//chrome/app:win_unit_tests",
-@@ -8224,6 +8227,10 @@ test("unit_tests") {
+@@ -8318,6 +8321,10 @@ test("unit_tests") {
       "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
     ]
 
@@ -74,9 +74,9 @@ index 86a3b56421319fb175a4a16ee885a53240a206a2..c4b78153010b4b1433dc9196f9f10a8a
     sources += [
       # The importer code is not used on Android.
       "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8299,7 +8306,6 @@ test("unit_tests") {
+@@ -8394,7 +8401,6 @@ test("unit_tests") {
+     }
 
-     # Non-android deps for "unit_tests" target.
     deps += [
 -      "//chrome:packed_resources_integrity_header",
       "//chrome/browser/apps:icon_standardizer",
--- a/patches/chromium/build_gn.patch
+++ b/patches/chromium/build_gn.patch
@@ -7,7 +7,7 @@ These are variables we add to the root BUILDCONFIG so that they're available
 everywhere, without having to import("//electron/.../flags.gni").

 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index d1a665482c989dfd92ce7fb2a2444bd9311f5513..42ad98845d84496e197d8b6e2f09a45a2608e585 100644
+index b8cac29305c3cfb5fbc0142ae17a4d802b52d80f..1221901b690b5a7a85179d909351c5b6a6fc67bf 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
--- a/Show More
+++ b/Show More