feat: support no-warnings and disable-warning Node.js cli flags

refactor: use gin_helper::Dictionary::ValueOrDefault() (#46982 )
* refactor: use ValueOrDefault() in electron_api_web_contents.cc * refactor: use ValueOrDefault() in electron_api_url_loader.cc * refactor: use ValueOrDefault() in electron_download_manager_delegate.cc * refactor: use ValueOrDefault() in electron_touch_bar.mm * refactor: use ValueOrDefault() in electron_url_loader_factory.cc * refactor: use ValueOrDefault() in electron_browser_context.cc * refactor: use ValueOrDefault() in electron_touch_bar.mm * refactor: use ValueOrDefault() in blink_converter.cc * feat: add ValueOrDefault() to PersistentDictionary * empty commit * refactor: use ValueOrDefault() in blink_converter.cc * refactor: inline the rectangle base::Value::Dict * refactor: remove has_scroll temporary --------- Co-authored-by: Deepak Mohan <hop2deep@gmail.com>
2026-04-10 03:01:51 -04:00 · 2025-05-08 22:19:37 -07:00 · 2025-05-08 14:17:22 -05:00 · 2025-05-08 11:34:21 -07:00 · 2025-05-08 09:02:19 -05:00 · 2025-05-08 10:07:10 +02:00
434 changed files with 6489 additions and 4806 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,4 +1,5 @@
 {
+	"name": "Electron Core Development Environment",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "buildtools",
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
@@ -33,27 +34,15 @@
 				"surajbarkale.ninja",
 				"ms-vscode.cpptools",
 				"mutantdino.resourcemonitor",
+				"dsanders11.vscode-electron-build-tools",
 				"dbaeumer.vscode-eslint",
 				"shakram02.bash-beautify",
-				"marshallofsound.gnls-electron",
+				"marshallofsound.gnls-electron"
 			],
 			"settings": {
 				"editor.tabSize": 2,
 				"bashBeautify.tabSize": 2,
 				"typescript.tsdk": "node_modules/typescript/lib",
-				"[gn]": {
-					"editor.formatOnSave": true
-				},
-				"[javascript]": {
-					"editor.codeActionsOnSave": {
-						"source.fixAll.eslint": true
-					}
-				},
-				"[typescript]": {
-					"editor.codeActionsOnSave": {
-						"source.fixAll.eslint": true
-					}
-				},
 				"javascript.preferences.quoteStyle": "single",
 				"typescript.preferences.quoteStyle": "single"
 			}
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'

 services:
  buildtools:
-    image: ghcr.io/electron/devcontainer:9f11982e806f439d0a0a8ebbbf566cd5e0d9e952
+    image: ghcr.io/electron/devcontainer:424eedbf277ad9749ffa9219068aa72ed4a5e373

    volumes:
      - ..:/workspaces/gclient/src/electron:cached
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -73,7 +73,7 @@ body:
 - type: input
  attributes:
    label: Testcase Gist URL
-    description: If you can reproduce the issue in a standalone test case, please use [Electron Fiddle](https://github.com/electron/fiddle) to create one and to publish it as a [GitHub gist](https://gist.github.com) and put the gist URL here. This is **the best way** to ensure this issue is triaged quickly.
+    description: Electron maintainers need a standalone test case to reproduce and fix your issue. Please use [Electron Fiddle](https://github.com/electron/fiddle) to create one and to publish it as a [GitHub gist](https://gist.github.com). Then put the gist URL here. Issues without testcase gists receive less attention and might be closed without a maintainer taking a closer look. To maximize how much attention your issue receives, please include a testcase gist right from the start.
    placeholder: https://gist.github.com/...
 - type: textarea
  attributes:
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -179,3 +179,11 @@ runs:
      else
        echo "Cache key persisted in $final_cache_path"
      fi
+  - name: Wait for active SSH sessions
+    shell: bash
+    if: always() && !cancelled()
+    run: |
+      while [ -f /var/.ssh-lock ]
+      do
+        sleep 60
+      done
--- a/.github/actions/install-build-tools/action.yml
+++ b/.github/actions/install-build-tools/action.yml
@@ -10,8 +10,10 @@ runs:
        git config --global core.filemode false
        git config --global core.autocrlf false
        git config --global branch.autosetuprebase always
+        git config --global core.fscache true
+        git config --global core.preloadindex true
      fi
-      export BUILD_TOOLS_SHA=8246e57791b0af4ae5975eb96f09855f9269b1cd
+      export BUILD_TOOLS_SHA=6e8526315ea3b4828882497e532b8340e64e053c
      npm i -g @electron/build-tools
      e auto-update disable
      e d auto-update disable
@@ -20,3 +22,4 @@ runs:
        cp "C:\Python311\python.exe" "C:\Python311\python3.exe"
      fi
      echo "$HOME/.electron_build_tools/third_party/depot_tools" >> $GITHUB_PATH
+      echo "$HOME/.electron_build_tools/third_party/depot_tools/python-bin" >> $GITHUB_PATH
--- a/.github/workflows/archaeologist-dig.yml
+++ b/.github/workflows/archaeologist-dig.yml
@@ -13,7 +13,7 @@ jobs:
        with:
          fetch-depth: 0
      - name: Setup Node.js/npm
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
        with:
          node-version: 20.11.x
      - name: Setting Up Dig Site
@@ -41,7 +41,7 @@ jobs:
          sha-file: .dig-old
          filename: electron.old.d.ts
      - name: Upload artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2
        with:
          name: artifacts
          path: electron/artifacts
--- a/.github/workflows/branch-created.yml
+++ b/.github/workflows/branch-created.yml
@@ -94,7 +94,7 @@ jobs:
            }))
      - name: Create Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/copy-project@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/copy-project@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        id: create-release-board
        with:
          drafts: true
@@ -114,14 +114,15 @@ 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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/find-project@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        id: find-prev-release-board
        with:
+          fail-if-project-not-found: false
          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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        if: ${{ steps.find-prev-release-board.outputs.number }}
+        uses: dsanders11/project-actions/close-project@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.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
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952'
+        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
        required: true
      skip-macos:
        type: boolean
@@ -64,7 +64,7 @@ jobs:
      id: set-output
      run: |
        if [ -z "${{ inputs.build-image-sha }}" ]; then
-          echo "build-image-sha=9f11982e806f439d0a0a8ebbbf566cd5e0d9e952" >> "$GITHUB_OUTPUT"
+          echo "build-image-sha=424eedbf277ad9749ffa9219068aa72ed4a5e373" >> "$GITHUB_OUTPUT"
        else
          echo "build-image-sha=${{ inputs.build-image-sha }}" >> "$GITHUB_OUTPUT"
        fi
--- 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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
@@ -39,7 +39,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
--- 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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/add-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          field: Reporter
          field-value: ${{ github.event.issue.user.login }}
--- a/.github/workflows/issue-transferred.yml
+++ b/.github/workflows/issue-transferred.yml
@@ -19,7 +19,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Remove from issue triage
-        uses: dsanders11/project-actions/delete-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/delete-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
--- 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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
--- a/.github/workflows/linux-publish.yml
+++ b/.github/workflows/linux-publish.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952'
+        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
      upload-to-storage:
        description: 'Uploads to Azure storage'
        required: false
--- a/.github/workflows/macos-publish.yml
+++ b/.github/workflows/macos-publish.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952'
+        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
        required: true
      upload-to-storage:
        description: 'Uploads to Azure storage'
--- a/.github/workflows/pipeline-segment-electron-build.yml
+++ b/.github/workflows/pipeline-segment-electron-build.yml
@@ -102,7 +102,7 @@ jobs:
      run: df -h
    - name: Setup Node.js/npm
      if: ${{ inputs.target-platform == 'macos' }}
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
      with:
        node-version: 20.11.x
        cache: yarn
--- a/.github/workflows/pipeline-segment-electron-test.yml
+++ b/.github/workflows/pipeline-segment-electron-test.yml
@@ -79,7 +79,7 @@ jobs:
        cp "C:\Python311\python.exe" "C:\Python311\python3.exe"
    - name: Setup Node.js/npm
      if: ${{ inputs.target-platform == 'win' }}
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
      with:
        node-version: 20.11.x
    - name: Add TCC permissions on macOS
@@ -134,6 +134,8 @@ jobs:
        git config --global core.filemode false
        git config --global core.autocrlf false
        git config --global branch.autosetuprebase always
+        git config --global core.fscache true
+        git config --global core.preloadindex true
        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
@@ -147,12 +149,12 @@ jobs:
        echo "DISABLE_CRASH_REPORTER_TESTS=true" >> $GITHUB_ENV
        echo "IS_ASAN=true" >> $GITHUB_ENV
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: generated_artifacts_${{ env.ARTIFACT_KEY }}
        path: ./generated_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: src_artifacts_${{ env.ARTIFACT_KEY }}
        path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
@@ -247,7 +249,7 @@ jobs:
      if: always() && !cancelled()
    - name: Upload Test Artifacts
      if: always() && !cancelled()
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
      with:
        name: test_artifacts_${{ env.ARTIFACT_KEY }}_${{ matrix.shard }}
        path: src/electron/spec/artifacts
--- a/.github/workflows/pipeline-segment-node-nan-test.yml
+++ b/.github/workflows/pipeline-segment-node-nan-test.yml
@@ -61,12 +61,12 @@ jobs:
    - name: Install Dependencies
      uses: ./src/electron/.github/actions/install-dependencies
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
@@ -115,12 +115,12 @@ jobs:
    - name: Install Dependencies
      uses: ./src/electron/.github/actions/install-dependencies
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
      with:
        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
--- a/.github/workflows/pull-request-labeled.yml
+++ b/.github/workflows/pull-request-labeled.yml
@@ -33,7 +33,7 @@ jobs:
          creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 94
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -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@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
        with:
          sarif_file: results.sarif
--- 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@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/completed-by@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0
        with:
          field: Prep Status
          field-value: ✅ Complete
--- a/.github/workflows/windows-publish.yml
+++ b/.github/workflows/windows-publish.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: '9f11982e806f439d0a0a8ebbbf566cd5e0d9e952'
+        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
        required: true
      upload-to-storage:
        description: 'Uploads to Azure storage'
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -17,19 +17,19 @@ import("//tools/grit/repack.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//v8/gni/snapshot_toolchain.gni")
 import("build/asar.gni")
+import("build/electron_paks.gni")
 import("build/extract_symbols.gni")
+import("build/js2c_toolchain.gni")
 import("build/npm.gni")
 import("build/templated_file.gni")
 import("build/tsc.gni")
 import("build/webpack/webpack.gni")
 import("buildflags/buildflags.gni")
-import("electron_paks.gni")
 import("filenames.auto.gni")
 import("filenames.gni")
 import("filenames.hunspell.gni")
 import("filenames.libcxx.gni")
 import("filenames.libcxxabi.gni")
-import("js2c_toolchain.gni")

 if (is_mac) {
  import("//build/config/mac/rules.gni")
@@ -314,7 +314,7 @@ asar("default_app_asar") {
 }

 grit("resources") {
-  source = "electron_resources.grd"
+  source = "build/electron_resources.grd"

  outputs = [
    "grit/electron_resources.h",
@@ -670,6 +670,8 @@ source_set("electron_lib") {
    sources += [
      "shell/browser/certificate_manager_model.cc",
      "shell/browser/certificate_manager_model.h",
+      "shell/browser/linux/x11_util.cc",
+      "shell/browser/linux/x11_util.h",
      "shell/browser/ui/gtk_util.cc",
      "shell/browser/ui/gtk_util.h",
    ]
--- a/4
+++ b/4
@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '136.0.7067.0',
+    '138.0.7165.0',
  'node_version':
-    'v22.14.0',
+    'v22.15.0',
  'nan_version':
    'e14bdcd1f72d62bca1d541b66da43130384ec213',
  'squirrel.mac_version':
--- 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 = 135
+node_module_version = 136

 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -73,5 +73,3 @@ enterprise_cloud_content_analysis = false
 # TODO: remove dependency on legacy ipc
 # https://issues.chromium.org/issues/40943039
 content_enable_legacy_ipc = true
-
-clang_unsafe_buffers_paths = "//electron/electron_unsafe_buffers_paths.txt"
--- a/build/electron_paks.gni
+++ b/build/electron_paks.gni
--- a/build/electron_resources.grd
+++ b/build/electron_resources.grd
--- a/build/js2c_toolchain.gni
+++ b/build/js2c_toolchain.gni
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -85,6 +85,8 @@ static_library("chrome") {
    "//chrome/browser/process_singleton.h",
    "//chrome/browser/process_singleton_internal.cc",
    "//chrome/browser/process_singleton_internal.h",
+    "//chrome/browser/serial/serial_blocklist.cc",
+    "//chrome/browser/serial/serial_blocklist.h",
    "//chrome/browser/themes/browser_theme_pack.cc",
    "//chrome/browser/themes/browser_theme_pack.h",
    "//chrome/browser/themes/custom_theme_supplier.cc",
@@ -144,6 +146,8 @@ static_library("chrome") {
    "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
    "//chrome/browser/ui/webui/accessibility/accessibility_ui.cc",
    "//chrome/browser/ui/webui/accessibility/accessibility_ui.h",
+    "//chrome/browser/usb/usb_blocklist.cc",
+    "//chrome/browser/usb/usb_blocklist.h",
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
    "//ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.cc",
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -1110,6 +1110,11 @@ indicates success while any other value indicates failure according to Chromium
    resolver will attempt to use the system's DNS settings to do DNS lookups
    itself. Enabled by default on macOS, disabled by default on Windows and
    Linux.
+  * `enableHappyEyeballs` boolean (optional) - Whether the
+    [Happy Eyeballs V3][happy-eyeballs-v3] algorithm should be used in creating
+    network connections. When enabled, hostnames resolving to multiple IP
+    addresses will be attempted in parallel to have a chance at establishing a
+    connection more quickly.
  * `secureDnsMode` string (optional) - Can be 'off', 'automatic' or 'secure'.
    Configures the DNS-over-HTTP mode. When 'off', no DoH lookups will be
    performed. When 'automatic', DoH lookups will be performed first if DoH is
@@ -1485,7 +1490,7 @@ and internal requests made by the runtime (ex: geolocation queries).

 This method can only be called after app is ready.

-#### `app.resolveProxy(url)`
+### `app.resolveProxy(url)`

 * `url` URL

@@ -1579,6 +1584,7 @@ A `boolean` property that returns  `true` if the app is packaged, `false` otherw
 [Squirrel-Windows]: https://github.com/Squirrel/Squirrel.Windows
 [JumpListBeginListMSDN]: https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobjidl_core-icustomdestinationlist-beginlist
 [about-panel-options]: https://developer.apple.com/reference/appkit/nsapplication/1428479-orderfrontstandardaboutpanelwith?language=objc
+[happy-eyeballs-v3]: https://datatracker.ietf.org/doc/draft-pauly-happy-happyeyeballs-v3/

 ### `app.name`

--- a/docs/api/base-window.md
+++ b/docs/api/base-window.md
@@ -356,7 +356,7 @@ as `-webkit-app-region: drag` in a frameless window.

 Calling `event.preventDefault()` will prevent the menu from being displayed.

-To convert `point` to DIP, use [`screen.screenToDipPoint(point)`](./screen.md#screenscreentodippointpoint-windows).
+To convert `point` to DIP, use [`screen.screenToDipPoint(point)`](./screen.md#screenscreentodippointpoint-windows-linux).

 ### Static Methods

@@ -398,7 +398,7 @@ A `View` property for the content view of the window.

 A `string` (optional) property that is equal to the `tabbingIdentifier` passed to the `BrowserWindow` constructor or `undefined` if none was set.

-#### `win.autoHideMenuBar`
+#### `win.autoHideMenuBar` _Linux_ _Windows_

 A `boolean` property that determines whether the window menu bar should hide itself automatically. Once set, the menu bar will only show when users press the single `Alt` key.

--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -435,7 +435,7 @@ as `-webkit-app-region: drag` in a frameless window.

 Calling `event.preventDefault()` will prevent the menu from being displayed.

-To convert `point` to DIP, use [`screen.screenToDipPoint(point)`](./screen.md#screenscreentodippointpoint-windows).
+To convert `point` to DIP, use [`screen.screenToDipPoint(point)`](./screen.md#screenscreentodippointpoint-windows-linux).

 ### Static Methods

@@ -499,7 +499,7 @@ A `Integer` property representing the unique ID of the window. Each ID is unique

 A `string` (optional) property that is equal to the `tabbingIdentifier` passed to the `BrowserWindow` constructor or `undefined` if none was set.

-#### `win.autoHideMenuBar`
+#### `win.autoHideMenuBar` _Linux_ _Windows_

 A `boolean` property that determines whether the window menu bar should hide itself automatically. Once set, the menu bar will only show when users press the single `Alt` key.

--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -272,6 +272,13 @@ Set the `host:port` to be used when the inspector is activated. Useful when acti

 Aliased to `--debug-port=[host:]port`.

+### `--disable-warning=code-or-type`
+
+Disable specific process warnings by `code` or `type`.
+
+Warnings emitted from [`process.emitWarning()`](https://nodejs.org/api/process.html#processemitwarningwarning-options)
+may contain a `code` and a `type`. This option will not-emit warnings that have a matching `code` or `type`.
+
 ### `--inspect\[=\[host:]port]`

 Activate inspector on `host:port`. Default is `127.0.0.1:9229`.
@@ -292,6 +299,10 @@ By default inspector websocket url is available in stderr and under /json/list e

 Silence deprecation warnings.

+### `--no-warnings`
+
+Silence all process warnings (including deprecations).
+
 ### `--throw-deprecation`

 Throw errors for deprecations.
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -74,7 +74,7 @@ The `menu` object has the following instance methods:
 * `options` Object (optional)
  * `window` [BaseWindow](base-window.md) (optional) - Default is the focused window.
  * `frame` [WebFrameMain](web-frame-main.md) (optional) - Provide the relevant frame
-    if you want certain OS-level features such as Writing Tools on macOS to function correctly. Typically, this should be `params.frame` from the [`context-menu` event](web-contents.md#event-context-menu) on a WebContents.
+    if you want certain OS-level features such as Writing Tools on macOS to function correctly. Typically, this should be `params.frame` from the [`context-menu` event](web-contents.md#event-context-menu) on a WebContents, or the [`focusedFrame` property](web-contents.md#contentsfocusedframe-readonly) of a WebContents.
  * `x` number (optional) - Default is the current mouse cursor position.
    Must be declared if `y` is declared.
  * `y` number (optional) - Default is the current mouse cursor position.
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -142,8 +142,8 @@ Note: The Windows implementation will ignore `size.height` and scale the height

 Returns `NativeImage`

-Creates a new `NativeImage` instance from a file located at `path`. This method
-returns an empty image if the `path` does not exist, cannot be read, or is not
+Creates a new `NativeImage` instance from an image file (e.g., PNG or JPEG) located at `path`.
+This method returns an empty image if the `path` does not exist, cannot be read, or is not
 a valid image.

 ```js
@@ -271,16 +271,12 @@ changes:

 Returns `string` - The [Data URL][data-url] of the image.

-#### `image.getBitmap([options])`
+#### `image.getBitmap([options])` _Deprecated_

 * `options` Object (optional)
  * `scaleFactor` Number (optional) - Defaults to 1.0.

-Returns `Buffer` - A [Buffer][buffer] that contains the image's raw bitmap pixel data.
-
-The difference between `getBitmap()` and `toBitmap()` is that `getBitmap()` does not
-copy the bitmap data, so you have to use the returned Buffer immediately in
-current event loop tick; otherwise the data might be changed or destroyed.
+Legacy alias for `image.toBitmap()`.

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

--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -63,6 +63,14 @@ Your application should then always use `shouldUseDarkColors` to determine what
 A `boolean` for if the OS / Chromium currently has high-contrast mode enabled
 or is being instructed to show a high-contrast UI.

+### `nativeTheme.shouldUseDarkColorsForSystemIntegratedUI` _macOS_ _Windows_ _Readonly_
+
+A `boolean` property indicating whether or not the system theme has been set to dark or light.
+
+On Windows this property distinguishes between system and app light/dark theme, returning
+`true` if the system theme is set to dark theme and `false` otherwise. On macOS the return
+value will be the same as `nativeTheme.shouldUseDarkColors`.
+
 ### `nativeTheme.shouldUseInvertedColorScheme` _macOS_ _Windows_ _Readonly_

 A `boolean` for if the OS / Chromium currently has an inverted color scheme
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -124,7 +124,7 @@ Returns [`Display`](structures/display.md) - The display nearest the specified p
 Returns [`Display`](structures/display.md) - The display that most closely
 intersects the provided bounds.

-### `screen.screenToDipPoint(point)` _Windows_
+### `screen.screenToDipPoint(point)` _Windows_ _Linux_

 * `point` [Point](structures/point.md)

@@ -133,7 +133,10 @@ Returns [`Point`](structures/point.md)
 Converts a screen physical point to a screen DIP point.
 The DPI scale is performed relative to the display containing the physical point.

-### `screen.dipToScreenPoint(point)` _Windows_
+Not currently supported on Wayland - if used there it will return the point passed
+in with no changes.
+
+### `screen.dipToScreenPoint(point)` _Windows_ _Linux_

 * `point` [Point](structures/point.md)

@@ -142,6 +145,8 @@ Returns [`Point`](structures/point.md)
 Converts a screen DIP point to a screen physical point.
 The DPI scale is performed relative to the display containing the DIP point.

+Not currently supported on Wayland.
+
 ### `screen.screenToDipRect(window, rect)` _Windows_

 * `window` [BrowserWindow](browser-window.md) | null
--- a/docs/api/service-worker-main.md
+++ b/docs/api/service-worker-main.md
@@ -46,6 +46,10 @@ An [`IpcMainServiceWorker`](ipc-main-service-worker.md) instance scoped to the s

 A `string` representing the scope URL of the service worker.

+#### `serviceWorker.scriptURL` _Readonly_ _Experimental_
+
+A `string` representing the script URL of the service worker.
+
 #### `serviceWorker.versionId` _Readonly_ _Experimental_

 A `number` representing the ID of the specific version of the service worker script in its scope.
--- a/docs/api/structures/base-window-options.md
+++ b/docs/api/structures/base-window-options.md
@@ -58,8 +58,8 @@
  `false` on macOS. This option is not configurable on other platforms.
 * `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
  Default is `false`.
-* `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
-  key is pressed. Default is `false`.
+* `autoHideMenuBar` boolean (optional) _Linux_ _Windows_ - Auto hide the menu bar
+  unless the `Alt` key is pressed. Default is `false`.
 * `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
  be resized larger than screen. Only relevant for macOS, as other OSes
  allow larger-than-screen windows by default. Default is `false`.
--- a/docs/api/structures/protocol-response.md
+++ b/docs/api/structures/protocol-response.md
@@ -25,9 +25,8 @@
  and URL responses.
 * `method` string (optional) - The HTTP `method`. This is only used for file
  and URL responses.
-* `session` Session (optional) - The session used for requesting URL, by default
-  the HTTP request will reuse the current session. Setting `session` to `null`
-  would use a random independent session. This is only used for URL responses.
+* `session` Session (optional) - The session used for requesting URL.
+  The HTTP request will reuse the current session by default.
 * `uploadData` [ProtocolResponseUploadData](protocol-response-upload-data.md) (optional) - The data used as upload data. This is only
  used for URL responses when `method` is `"POST"`.

--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -238,7 +238,7 @@ Sets the `image` associated with this tray icon when pressed on macOS.

 * `toolTip` string

-Sets the hover text for this tray icon.
+Sets the hover text for this tray icon. Setting the text to an empty string will remove the tooltip.

 #### `tray.setTitle(title[, options])` _macOS_

--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -887,7 +887,7 @@ const { BrowserWindow } = require('electron')

 const win = new BrowserWindow({ webPreferences: { offscreen: true } })
 win.webContents.on('paint', (event, dirty, image) => {
-  // updateBitmap(dirty, image.getBitmap())
+  // updateBitmap(dirty, image.toBitmap())
 })
 win.loadURL('https://github.com')
 ```
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -14,11 +14,44 @@ This document uses the following convention to categorize breaking changes:

 ## Planned Breaking API Changes (37.0)

+### Utility Process unhandled rejection behavior change
+
+Utility Processes will now warn with an error message when an unhandled
+rejection occurs instead of crashing the process.
+
+To restore the previous behavior, you can use:
+
+```js
+process.on('unhandledRejection', () => {
+  process.exit(1)
+})
+```
+
+### Behavior Changed: WebUSB and WebSerial Blocklist Support
+
+[WebUSB](https://developer.mozilla.org/en-US/docs/Web/API/WebUSB_API) and [Web Serial](https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API) now support the [WebUSB Blocklist](https://wicg.github.io/webusb/#blocklist) and [Web Serial Blocklist](https://wicg.github.io/serial/#blocklist) used by Chromium and outlined in their respective specifications.
+
+To disable these, users can pass `disable-usb-blocklist` and `disable-serial-blocklist` as command line flags.
+
+### Removed: `null` value for `session` property in `ProtocolResponse`
+
+This deprecated feature has been removed.
+
+Previously, setting the `ProtocolResponse.session` property to `null`
+would create a random independent session. This is no longer supported.
+
+Using single-purpose sessions here is discouraged due to overhead costs;
+however, old code that needs to preserve this behavior can emulate it by
+creating a random session with `session.fromPartition(some_random_string)`
+and then using it in `ProtocolResponse.session`.
+
 ### Behavior Changed: `BrowserWindow.IsVisibleOnAllWorkspaces()` on Linux

 `BrowserWindow.IsVisibleOnAllWorkspaces()` will now return false on Linux if the
 window is not currently visible.

+## Planned Breaking API Changes (36.0)
+
 ### Behavior Changes: `app.commandLine`

 `app.commandLine` will convert upper-cases switches and arguments to lowercase.
@@ -27,9 +60,20 @@ window is not currently visible.

 If you were using `app.commandLine` to control the behavior of the  main process, you should do this via `process.argv`.

-## Planned Breaking API Changes (36.0)
+### Deprecated: `NativeImage.getBitmap()`

-### Removed:`isDefault` and `status` properties on `PrinterInfo`
+`NativeImage.toBitmap()` returns a newly-allocated copy of the bitmap. `NativeImage.getBitmap()` was originally an alternative function that returned the original instead of a copy. This changed when sandboxing was introduced, so both return a copy and are functionally equivalent.
+
+Client code should call `NativeImage.toBitmap()` instead:
+
+```js
+// Deprecated
+bitmap = image.getBitmap()
+// Use this instead
+bitmap = image.toBitmap()
+```
+
+### Removed: `isDefault` and `status` properties on `PrinterInfo`

 These properties have been removed from the PrinterInfo Object
 because they have been removed from upstream Chromium.
@@ -41,12 +85,6 @@ When calling `Session.clearStorageData(options)`, the `options.quota` type
 [removed](https://chromium-review.googlesource.com/c/chromium/src/+/6309405)
 from upstream Chromium.

-### Deprecated: `quota` property in `Session.clearStorageData(options)`
-
-When calling `Session.clearStorageData(options)`, the `options.quota`
-property is deprecated. Since the `syncable` type was removed, there
-is only type left -- `'temporary'` -- so specifying it is unnecessary.
-
 ### Deprecated: `null` value for `session` property in `ProtocolResponse`

 Previously, setting the ProtocolResponse.session property to `null`
@@ -57,6 +95,12 @@ however, old code that needs to preserve this behavior can emulate it by
 creating a random session with `session.fromPartition(some_random_string)`
 and then using it in `ProtocolResponse.session`.

+### Deprecated: `quota` property in `Session.clearStorageData(options)`
+
+When calling `Session.clearStorageData(options)`, the `options.quota`
+property is deprecated. Since the `syncable` type was removed, there
+is only type left -- `'temporary'` -- so specifying it is unnecessary.
+
 ### Deprecated: Extension methods and events on `session`

 `session.loadExtension`, `session.removeExtension`, `session.getExtension`,
@@ -71,6 +115,24 @@ It has been always returning `true` since Electron 23, which only supports Windo

 https://learn.microsoft.com/en-us/windows/win32/dwm/composition-ovw#disabling-dwm-composition-windows7-and-earlier

+### Changed: GTK 4 is default when running GNOME
+
+After an [upstream change](https://chromium-review.googlesource.com/c/chromium/src/+/6310469), GTK 4 is now the default when running GNOME.
+
+In rare cases, this may cause some applications or configurations to [error](https://github.com/electron/electron/issues/46538) with the following message:
+
+```stderr
+Gtk-ERROR **: 11:30:38.382: GTK 2/3 symbols detected. Using GTK 2/3 and GTK 4 in the same process is not supported
+```
+
+Affected users can work around this by specifying the `gtk-version` command-line flag:
+
+```shell
+$ electron --gtk-version=3   # or --gtk-version=2
+```
+
+The same can be done with the [`app.commandLine.appendSwitch`](https://www.electronjs.org/docs/latest/api/command-line#commandlineappendswitchswitch-value) function.
+
 ## Planned Breaking API Changes (35.0)

 ### Behavior Changed: Dialog API's `defaultPath` option on Linux
--- a/docs/fiddles/ipc/pattern-1/main.js
+++ b/docs/fiddles/ipc/pattern-1/main.js
@@ -1,6 +1,12 @@
 const { app, BrowserWindow, ipcMain } = require('electron/main')
 const path = require('node:path')

+function handleSetTitle (event, title) {
+  const webContents = event.sender
+  const win = BrowserWindow.fromWebContents(webContents)
+  win.setTitle(title)
+}
+
 function createWindow () {
  const mainWindow = new BrowserWindow({
    webPreferences: {
@@ -8,16 +14,11 @@ function createWindow () {
    }
  })

-  ipcMain.on('set-title', (event, title) => {
-    const webContents = event.sender
-    const win = BrowserWindow.fromWebContents(webContents)
-    win.setTitle(title)
-  })
-
  mainWindow.loadFile('index.html')
 }

 app.whenReady().then(() => {
+  ipcMain.on('set-title', handleSetTitle)
  createWindow()

  app.on('activate', function () {
--- a/docs/tutorial/custom-window-styles.md
+++ b/docs/tutorial/custom-window-styles.md
@@ -37,7 +37,6 @@ the illusion of a circular window.
  open on the user's system).
 * The window will not be transparent when DevTools is opened.
 * On _Windows_:
-  * Transparent windows will not work when DWM is disabled.
  * Transparent windows can not be maximized using the Windows system menu or by double
  clicking the title bar. The reasoning behind this can be seen on
  PR [#28207](https://github.com/electron/electron/pull/28207).
--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -57,7 +57,7 @@ the WebHID API:

 ### Blocklist

-By default Electron employs the same [blocklist](https://github.com/WICG/webhid/blob/main/blocklist.txt)
+By default Electron employs the same [blocklist](https://wicg.github.io/webhid/#blocklist)
 used by Chromium.  If you wish to override this behavior, you can do so by
 setting the `disable-hid-blocklist` flag:

@@ -104,6 +104,16 @@ There are several additional APIs for working with the Web Serial API:
 * [`ses.setPermissionCheckHandler(handler)`](../api/session.md#sessetpermissioncheckhandlerhandler)
  can be used to disable serial access for specific origins.

+### Blocklist
+
+By default Electron employs the same [blocklist](https://wicg.github.io/serial/#blocklist)
+used by Chromium.  If you wish to override this behavior, you can do so by
+setting the `disable-serial-blocklist` flag:
+
+```js
+app.commandLine.appendSwitch('disable-serial-blocklist')
+```
+
 ### Example

 This example demonstrates an Electron application that automatically selects
@@ -145,6 +155,16 @@ Electron provides several APIs for working with the WebUSB API:
 * [`ses.setUSBProtectedClassesHandler](../api/session.md#sessetusbprotectedclasseshandlerhandler)
  can be used to allow usage of [protected USB classes](https://wicg.github.io/webusb/#usbinterface-interface) that are not available by default.

+### Blocklist
+
+By default Electron employs the same [blocklist](https://wicg.github.io/webusb/#blocklist)
+used by Chromium.  If you wish to override this behavior, you can do so by
+setting the `disable-usb-blocklist` flag:
+
+```js
+app.commandLine.appendSwitch('disable-usb-blocklist')
+```
+
 ### Example

 This example demonstrates an Electron application that automatically selects
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -9,10 +9,11 @@ check out our [Electron Versioning](./electron-versioning.md) doc.

 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 36.0.0 |  2025-Mar-06 | 2025-Apr-02 | 2025-Apr-29 | 2025-Oct-28 | M136 | TBD | ✅ |
+| 37.0.0 |  2025-May-01 | 2025-May-28 | 2025-Jun-24 | 2026-Jan-13 | M138 | TBD | ✅ |
+| 36.0.0 |  2025-Mar-06 | 2025-Apr-02 | 2025-Apr-29 | 2025-Oct-28 | M136 | v22.14 | ✅ |
 | 35.0.0 |  2025-Jan-16 | 2025-Feb-05 | 2025-Mar-04 | 2025-Sep-02 | M134 | v22.14 | ✅ |
 | 34.0.0 |  2024-Oct-17 | 2024-Nov-13 | 2025-Jan-14 | 2025-Jun-24 | M132 | v20.18 | ✅ |
-| 33.0.0 |  2024-Aug-22 | 2024-Sep-18 | 2024-Oct-15 | 2025-Apr-29 | M130 | v20.18 | ✅ |
+| 33.0.0 |  2024-Aug-22 | 2024-Sep-18 | 2024-Oct-15 | 2025-Apr-29 | M130 | v20.18 | 🚫 |
 | 32.0.0 |  2024-Jun-14 | 2024-Jul-24 | 2024-Aug-20 | 2025-Mar-04 | M128 | v20.16 | 🚫 |
 | 31.0.0 |  2024-Apr-18 | 2024-May-15 | 2024-Jun-11 | 2025-Jan-14 | M126 | v20.14 | 🚫 |
 | 30.0.0 |  2024-Feb-22 | 2024-Mar-20 | 2024-Apr-16 | 2024-Oct-15 | M124 | v20.11 | 🚫 |
--- a/docs/tutorial/native-code-and-electron-objc-macos.md
+++ b/docs/tutorial/native-code-and-electron-objc-macos.md
--- a/electron_unsafe_buffers_paths.txt
+++ b/electron_unsafe_buffers_paths.txt
@@ -1,34 +0,0 @@
-# Copyright 2024 The Electron Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# The set of path prefixes that should be checked for unsafe buffer usage (see
-# -Wunsafe-buffer-usage in Clang).
-#
-# ***
-# Paths should be written as relative to the root of the source tree with
-# unix-style path separators. Directory prefixes should end with `/`, such
-# as `base/`.
-# ***
-#
-# Files in this set are known to not use pointer arithmetic/subscripting, and
-# make use of constructs like base::span or containers like std::vector instead.
-#
-# See `docs/unsafe_buffers.md`.
-
-# These directories are excluded because they come from outside Electron and
-# we don't have control over their contents.
-base/
-chrome/
-components/
-device/
-extensions/
-google_apis/
-net/
-services/
-skia/
-third_party/
-tools/
-ui/
-url/
-v8/
--- a/filenames.gni
+++ b/filenames.gni
@@ -35,6 +35,7 @@ filenames = {
    "shell/browser/relauncher_linux.cc",
    "shell/browser/ui/electron_desktop_window_tree_host_linux.cc",
    "shell/browser/ui/file_dialog_linux.cc",
+    "shell/browser/ui/file_dialog_linux_portal.cc",
    "shell/browser/ui/gtk/menu_gtk.cc",
    "shell/browser/ui/gtk/menu_gtk.h",
    "shell/browser/ui/gtk/menu_util.cc",
@@ -125,6 +126,7 @@ filenames = {
    "shell/browser/animation_util.h",
    "shell/browser/animation_util_mac.mm",
    "shell/browser/api/electron_api_app_mac.mm",
+    "shell/browser/api/electron_api_base_window_mac.mm",
    "shell/browser/api/electron_api_menu_mac.h",
    "shell/browser/api/electron_api_menu_mac.mm",
    "shell/browser/api/electron_api_native_theme_mac.mm",
@@ -650,8 +652,6 @@ filenames = {
    "shell/common/gin_helper/function_template_extensions.h",
    "shell/common/gin_helper/locker.cc",
    "shell/common/gin_helper/locker.h",
-    "shell/common/gin_helper/microtasks_scope.cc",
-    "shell/common/gin_helper/microtasks_scope.h",
    "shell/common/gin_helper/object_template_builder.cc",
    "shell/common/gin_helper/object_template_builder.h",
    "shell/common/gin_helper/persistent_dictionary.cc",
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -65,6 +65,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__algorithm/next_permutation.h",
  "//third_party/libc++/src/include/__algorithm/none_of.h",
  "//third_party/libc++/src/include/__algorithm/nth_element.h",
+  "//third_party/libc++/src/include/__algorithm/out_value_result.h",
  "//third_party/libc++/src/include/__algorithm/partial_sort.h",
  "//third_party/libc++/src/include/__algorithm/partial_sort_copy.h",
  "//third_party/libc++/src/include/__algorithm/partition.h",
@@ -341,7 +342,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/all_of.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/any_of.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/binary_search.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/clamp.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/comp.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/comp_ref_type.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/copy.h",
@@ -361,19 +361,11 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/find_if.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/find_if_not.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/find_segment_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/fold.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/for_each.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/for_each_n.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/for_each_segment.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/generate.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/generate_n.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/half_positive.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_found_result.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_fun_result.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_in_out_result.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_in_result.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_out_out_result.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/in_out_result.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/includes.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/inplace_merge.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/is_heap.h",
@@ -385,7 +377,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/iter_swap.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/iterator_operations.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/lexicographical_compare.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/lexicographical_compare_three_way.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/lower_bound.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/make_heap.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/make_projected.h",
@@ -394,7 +385,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/merge.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/min.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/min_element.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/min_max_result.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/minmax.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/minmax_element.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/mismatch.h",
@@ -410,99 +400,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/partition_point.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/pop_heap.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/prev_permutation.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/pstl.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/push_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_adjacent_find.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_all_of.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_any_of.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_binary_search.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_clamp.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_contains.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_contains_subrange.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_copy_backward.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_copy_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_copy_n.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_count.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_count_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_ends_with.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_equal.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_equal_range.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_fill.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_fill_n.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find_end.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find_first_of.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find_if_not.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_find_last.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_for_each.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_for_each_n.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_generate.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_generate_n.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_includes.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_inplace_merge.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_heap_until.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_partitioned.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_permutation.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_sorted.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_is_sorted_until.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_iterator_concept.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_lexicographical_compare.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_lower_bound.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_make_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_max.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_max_element.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_merge.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_min.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_min_element.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_minmax.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_minmax_element.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_mismatch.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_move.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_move_backward.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_next_permutation.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_none_of.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_nth_element.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_partial_sort.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_partial_sort_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_partition.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_partition_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_partition_point.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_pop_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_prev_permutation.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_push_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_remove.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_remove_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_remove_copy_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_remove_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_replace.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_replace_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_replace_copy_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_replace_if.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_reverse.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_reverse_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_rotate.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_rotate_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_sample.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_search.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_search_n.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_set_difference.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_set_intersection.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_set_symmetric_difference.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_set_union.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_shuffle.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_sort.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_sort_heap.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_stable_partition.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_stable_sort.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_starts_with.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_swap_ranges.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_transform.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_unique.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_unique_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/ranges_upper_bound.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/remove.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/remove_copy.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/remove_copy_if.h",
@@ -515,15 +413,12 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__algorithm/reverse_copy.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/rotate.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/rotate_copy.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/sample.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/search.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/search_n.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/set_difference.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/set_intersection.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/set_symmetric_difference.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/set_union.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/shift_left.h",
-  "//third_party/libc++/src/include/__cxx03/__algorithm/shift_right.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/shuffle.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/sift_down.h",
  "//third_party/libc++/src/include/__cxx03/__algorithm/simd_utils.h",
@@ -547,7 +442,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__atomic/atomic_flag.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/atomic_init.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/atomic_lock_free.h",
-  "//third_party/libc++/src/include/__cxx03/__atomic/atomic_ref.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/atomic_sync.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/check_memory_order.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/contention_t.h",
@@ -557,100 +451,19 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__atomic/kill_dependency.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/memory_order.h",
  "//third_party/libc++/src/include/__cxx03/__atomic/to_gcc_order.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/bit_cast.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/bit_ceil.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/bit_floor.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/bit_log2.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/bit_width.h",
  "//third_party/libc++/src/include/__cxx03/__bit/blsr.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/byteswap.h",
  "//third_party/libc++/src/include/__cxx03/__bit/countl.h",
  "//third_party/libc++/src/include/__cxx03/__bit/countr.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/endian.h",
-  "//third_party/libc++/src/include/__cxx03/__bit/has_single_bit.h",
  "//third_party/libc++/src/include/__cxx03/__bit/invert_if.h",
  "//third_party/libc++/src/include/__cxx03/__bit/popcount.h",
  "//third_party/libc++/src/include/__cxx03/__bit/rotate.h",
  "//third_party/libc++/src/include/__cxx03/__bit_reference",
-  "//third_party/libc++/src/include/__cxx03/__charconv/chars_format.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/from_chars_integral.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/from_chars_result.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/tables.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/to_chars.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/to_chars_base_10.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/to_chars_floating_point.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/to_chars_integral.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/to_chars_result.h",
-  "//third_party/libc++/src/include/__cxx03/__charconv/traits.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/calendar.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/concepts.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/convert_to_timespec.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/convert_to_tm.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/day.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/duration.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/exception.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/file_clock.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/formatter.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/hh_mm_ss.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/high_resolution_clock.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/leap_second.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/literals.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/local_info.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/month.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/month_weekday.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/monthday.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/ostream.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/parser_std_format_spec.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/statically_widen.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/steady_clock.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/sys_info.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/system_clock.h",
  "//third_party/libc++/src/include/__cxx03/__chrono/time_point.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/time_zone.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/time_zone_link.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/tzdb.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/tzdb_list.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/weekday.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/year.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/year_month.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/year_month_day.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/year_month_weekday.h",
-  "//third_party/libc++/src/include/__cxx03/__chrono/zoned_time.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/common_comparison_category.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/compare_partial_order_fallback.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/compare_strong_order_fallback.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/compare_three_way.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/compare_three_way_result.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/compare_weak_order_fallback.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/is_eq.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/ordering.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/partial_order.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/strong_order.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/synth_three_way.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/three_way_comparable.h",
-  "//third_party/libc++/src/include/__cxx03/__compare/weak_order.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/arithmetic.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/assignable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/boolean_testable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/class_or_enum.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/common_reference_with.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/common_with.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/constructible.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/convertible_to.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/copyable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/derived_from.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/destructible.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/different_from.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/equality_comparable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/invocable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/movable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/predicate.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/regular.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/relation.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/same_as.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/semiregular.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/swappable.h",
-  "//third_party/libc++/src/include/__cxx03/__concepts/totally_ordered.h",
  "//third_party/libc++/src/include/__cxx03/__condition_variable/condition_variable.h",
  "//third_party/libc++/src/include/__cxx03/__config",
  "//third_party/libc++/src/include/__cxx03/__config_site.in",
@@ -660,10 +473,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__configuration/config_site_shim.h",
  "//third_party/libc++/src/include/__cxx03/__configuration/language.h",
  "//third_party/libc++/src/include/__cxx03/__configuration/platform.h",
-  "//third_party/libc++/src/include/__cxx03/__coroutine/coroutine_handle.h",
-  "//third_party/libc++/src/include/__cxx03/__coroutine/coroutine_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__coroutine/noop_coroutine_handle.h",
-  "//third_party/libc++/src/include/__cxx03/__coroutine/trivial_awaitables.h",
  "//third_party/libc++/src/include/__cxx03/__debug_utils/randomize_range.h",
  "//third_party/libc++/src/include/__cxx03/__debug_utils/sanitizers.h",
  "//third_party/libc++/src/include/__cxx03/__debug_utils/strict_weak_ordering_check.h",
@@ -672,81 +481,18 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__exception/nested_exception.h",
  "//third_party/libc++/src/include/__cxx03/__exception/operations.h",
  "//third_party/libc++/src/include/__cxx03/__exception/terminate.h",
-  "//third_party/libc++/src/include/__cxx03/__expected/bad_expected_access.h",
-  "//third_party/libc++/src/include/__cxx03/__expected/expected.h",
-  "//third_party/libc++/src/include/__cxx03/__expected/unexpect.h",
-  "//third_party/libc++/src/include/__cxx03/__expected/unexpected.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/copy_options.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/directory_entry.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/directory_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/directory_options.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/file_status.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/file_time_type.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/file_type.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/filesystem_error.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/operations.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/path.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/path_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/perm_options.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/perms.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/recursive_directory_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/space_info.h",
-  "//third_party/libc++/src/include/__cxx03/__filesystem/u8path.h",
-  "//third_party/libc++/src/include/__cxx03/__format/buffer.h",
-  "//third_party/libc++/src/include/__cxx03/__format/concepts.h",
-  "//third_party/libc++/src/include/__cxx03/__format/container_adaptor.h",
-  "//third_party/libc++/src/include/__cxx03/__format/enable_insertable.h",
-  "//third_party/libc++/src/include/__cxx03/__format/escaped_output_table.h",
-  "//third_party/libc++/src/include/__cxx03/__format/extended_grapheme_cluster_table.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_arg.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_arg_store.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_args.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_context.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_error.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_functions.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_parse_context.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_string.h",
-  "//third_party/libc++/src/include/__cxx03/__format/format_to_n_result.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_bool.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_char.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_floating_point.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_integer.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_integral.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_output.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_pointer.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_string.h",
-  "//third_party/libc++/src/include/__cxx03/__format/formatter_tuple.h",
-  "//third_party/libc++/src/include/__cxx03/__format/indic_conjunct_break_table.h",
-  "//third_party/libc++/src/include/__cxx03/__format/parser_std_format_spec.h",
-  "//third_party/libc++/src/include/__cxx03/__format/range_default_formatter.h",
-  "//third_party/libc++/src/include/__cxx03/__format/range_formatter.h",
-  "//third_party/libc++/src/include/__cxx03/__format/unicode.h",
-  "//third_party/libc++/src/include/__cxx03/__format/width_estimation_table.h",
-  "//third_party/libc++/src/include/__cxx03/__format/write_escaped.h",
  "//third_party/libc++/src/include/__cxx03/__functional/binary_function.h",
  "//third_party/libc++/src/include/__cxx03/__functional/binary_negate.h",
  "//third_party/libc++/src/include/__cxx03/__functional/bind.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/bind_back.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/bind_front.h",
  "//third_party/libc++/src/include/__cxx03/__functional/binder1st.h",
  "//third_party/libc++/src/include/__cxx03/__functional/binder2nd.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/boyer_moore_searcher.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/compose.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/default_searcher.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/function.h",
  "//third_party/libc++/src/include/__cxx03/__functional/hash.h",
  "//third_party/libc++/src/include/__cxx03/__functional/identity.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/invoke.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/is_transparent.h",
  "//third_party/libc++/src/include/__cxx03/__functional/mem_fn.h",
  "//third_party/libc++/src/include/__cxx03/__functional/mem_fun_ref.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/not_fn.h",
  "//third_party/libc++/src/include/__cxx03/__functional/operations.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/perfect_forward.h",
  "//third_party/libc++/src/include/__cxx03/__functional/pointer_to_binary_function.h",
  "//third_party/libc++/src/include/__cxx03/__functional/pointer_to_unary_function.h",
-  "//third_party/libc++/src/include/__cxx03/__functional/ranges_operations.h",
  "//third_party/libc++/src/include/__cxx03/__functional/reference_wrapper.h",
  "//third_party/libc++/src/include/__cxx03/__functional/unary_function.h",
  "//third_party/libc++/src/include/__cxx03/__functional/unary_negate.h",
@@ -755,24 +501,19 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__fwd/bit_reference.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/complex.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/deque.h",
-  "//third_party/libc++/src/include/__cxx03/__fwd/format.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/fstream.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/functional.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/ios.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/istream.h",
-  "//third_party/libc++/src/include/__cxx03/__fwd/mdspan.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/memory.h",
-  "//third_party/libc++/src/include/__cxx03/__fwd/memory_resource.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/ostream.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/pair.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/queue.h",
-  "//third_party/libc++/src/include/__cxx03/__fwd/span.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/sstream.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/stack.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/streambuf.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/string.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/string_view.h",
-  "//third_party/libc++/src/include/__cxx03/__fwd/subrange.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/tuple.h",
  "//third_party/libc++/src/include/__cxx03/__fwd/vector.h",
  "//third_party/libc++/src/include/__cxx03/__hash_table",
@@ -782,43 +523,22 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__iterator/aliasing_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/back_insert_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/bounded_iter.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/common_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/concepts.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/counted_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/cpp17_iterator_concepts.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/data.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/default_sentinel.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/distance.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/empty.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/erase_if_container.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/front_insert_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/incrementable_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/indirectly_comparable.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/insert_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/istream_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/istreambuf_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/iter_move.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/iter_swap.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/iterator_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/iterator_with_data.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/mergeable.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/move_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/move_sentinel.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/next.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/ostream_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/ostreambuf_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/permutable.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/prev.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/projected.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/ranges_iterator_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/readable_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/reverse_access.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/reverse_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/segmented_iterator.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/size.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/sortable.h",
-  "//third_party/libc++/src/include/__cxx03/__iterator/unreachable_sentinel.h",
  "//third_party/libc++/src/include/__cxx03/__iterator/wrap_iter.h",
  "//third_party/libc++/src/include/__cxx03/__locale",
  "//third_party/libc++/src/include/__cxx03/__locale_dir/locale_base_api/android.h",
@@ -849,16 +569,9 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__math/remainder.h",
  "//third_party/libc++/src/include/__cxx03/__math/roots.h",
  "//third_party/libc++/src/include/__cxx03/__math/rounding_functions.h",
-  "//third_party/libc++/src/include/__cxx03/__math/special_functions.h",
  "//third_party/libc++/src/include/__cxx03/__math/traits.h",
  "//third_party/libc++/src/include/__cxx03/__math/trigonometric_functions.h",
  "//third_party/libc++/src/include/__cxx03/__mbstate_t.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/default_accessor.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/extents.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/layout_left.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/layout_right.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/layout_stride.h",
-  "//third_party/libc++/src/include/__cxx03/__mdspan/mdspan.h",
  "//third_party/libc++/src/include/__cxx03/__memory/addressof.h",
  "//third_party/libc++/src/include/__cxx03/__memory/align.h",
  "//third_party/libc++/src/include/__cxx03/__memory/aligned_alloc.h",
@@ -872,14 +585,9 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__memory/auto_ptr.h",
  "//third_party/libc++/src/include/__cxx03/__memory/builtin_new_allocator.h",
  "//third_party/libc++/src/include/__cxx03/__memory/compressed_pair.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/concepts.h",
  "//third_party/libc++/src/include/__cxx03/__memory/construct_at.h",
  "//third_party/libc++/src/include/__cxx03/__memory/destruct_n.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/inout_ptr.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/out_ptr.h",
  "//third_party/libc++/src/include/__cxx03/__memory/pointer_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/ranges_construct_at.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/ranges_uninitialized_algorithms.h",
  "//third_party/libc++/src/include/__cxx03/__memory/raw_storage_iterator.h",
  "//third_party/libc++/src/include/__cxx03/__memory/shared_ptr.h",
  "//third_party/libc++/src/include/__cxx03/__memory/swap_allocator.h",
@@ -888,54 +596,18 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__memory/uninitialized_algorithms.h",
  "//third_party/libc++/src/include/__cxx03/__memory/unique_ptr.h",
  "//third_party/libc++/src/include/__cxx03/__memory/uses_allocator.h",
-  "//third_party/libc++/src/include/__cxx03/__memory/uses_allocator_construction.h",
  "//third_party/libc++/src/include/__cxx03/__memory/voidify.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/memory_resource.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/monotonic_buffer_resource.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/polymorphic_allocator.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/pool_options.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/synchronized_pool_resource.h",
-  "//third_party/libc++/src/include/__cxx03/__memory_resource/unsynchronized_pool_resource.h",
  "//third_party/libc++/src/include/__cxx03/__mutex/lock_guard.h",
  "//third_party/libc++/src/include/__cxx03/__mutex/mutex.h",
  "//third_party/libc++/src/include/__cxx03/__mutex/once_flag.h",
  "//third_party/libc++/src/include/__cxx03/__mutex/tag_types.h",
  "//third_party/libc++/src/include/__cxx03/__mutex/unique_lock.h",
-  "//third_party/libc++/src/include/__cxx03/__node_handle",
  "//third_party/libc++/src/include/__cxx03/__numeric/accumulate.h",
  "//third_party/libc++/src/include/__cxx03/__numeric/adjacent_difference.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/exclusive_scan.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/gcd_lcm.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/inclusive_scan.h",
  "//third_party/libc++/src/include/__cxx03/__numeric/inner_product.h",
  "//third_party/libc++/src/include/__cxx03/__numeric/iota.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/midpoint.h",
  "//third_party/libc++/src/include/__cxx03/__numeric/partial_sum.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/pstl.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/reduce.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/saturation_arithmetic.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/transform_exclusive_scan.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/transform_inclusive_scan.h",
-  "//third_party/libc++/src/include/__cxx03/__numeric/transform_reduce.h",
  "//third_party/libc++/src/include/__cxx03/__ostream/basic_ostream.h",
-  "//third_party/libc++/src/include/__cxx03/__ostream/print.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backend.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backend_fwd.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backends/default.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backends/libdispatch.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backends/serial.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/backends/std_thread.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/any_of.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/cpu_traits.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/fill.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/find_if.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/for_each.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/merge.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/stable_sort.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/transform.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/cpu_algos/transform_reduce.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/dispatch.h",
-  "//third_party/libc++/src/include/__cxx03/__pstl/handle_exception.h",
  "//third_party/libc++/src/include/__cxx03/__random/bernoulli_distribution.h",
  "//third_party/libc++/src/include/__cxx03/__random/binomial_distribution.h",
  "//third_party/libc++/src/include/__cxx03/__random/cauchy_distribution.h",
@@ -970,62 +642,11 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__random/student_t_distribution.h",
  "//third_party/libc++/src/include/__cxx03/__random/subtract_with_carry_engine.h",
  "//third_party/libc++/src/include/__cxx03/__random/uniform_int_distribution.h",
-  "//third_party/libc++/src/include/__cxx03/__random/uniform_random_bit_generator.h",
  "//third_party/libc++/src/include/__cxx03/__random/uniform_real_distribution.h",
  "//third_party/libc++/src/include/__cxx03/__random/weibull_distribution.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/access.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/all.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/as_rvalue_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/chunk_by_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/common_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/concepts.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/container_compatible_range.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/counted.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/dangling.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/data.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/drop_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/drop_while_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/elements_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/empty.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/empty_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/enable_borrowed_range.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/enable_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/filter_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/from_range.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/iota_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/istream_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/join_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/lazy_split_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/movable_box.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/non_propagating_cache.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/owning_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/range_adaptor.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/rbegin.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/ref_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/rend.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/repeat_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/reverse_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/single_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/size.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/split_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/subrange.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/take_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/take_while_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/to.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/transform_view.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/view_interface.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/views.h",
-  "//third_party/libc++/src/include/__cxx03/__ranges/zip_view.h",
  "//third_party/libc++/src/include/__cxx03/__split_buffer",
  "//third_party/libc++/src/include/__cxx03/__std_clang_module",
  "//third_party/libc++/src/include/__cxx03/__std_mbstate_t.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/atomic_unique_lock.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/intrusive_list_view.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/intrusive_shared_ptr.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/stop_callback.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/stop_source.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/stop_state.h",
-  "//third_party/libc++/src/include/__cxx03/__stop_token/stop_token.h",
  "//third_party/libc++/src/include/__cxx03/__string/char_traits.h",
  "//third_party/libc++/src/include/__cxx03/__string/constexpr_c_functions.h",
  "//third_party/libc++/src/include/__cxx03/__string/extern_template_lists.h",
@@ -1040,9 +661,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__system_error/error_code.h",
  "//third_party/libc++/src/include/__cxx03/__system_error/error_condition.h",
  "//third_party/libc++/src/include/__cxx03/__system_error/system_error.h",
-  "//third_party/libc++/src/include/__cxx03/__thread/formatter.h",
  "//third_party/libc++/src/include/__cxx03/__thread/id.h",
-  "//third_party/libc++/src/include/__cxx03/__thread/jthread.h",
  "//third_party/libc++/src/include/__cxx03/__thread/poll_with_backoff.h",
  "//third_party/libc++/src/include/__cxx03/__thread/support/c11.h",
  "//third_party/libc++/src/include/__cxx03/__thread/support/external.h",
@@ -1054,7 +673,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__thread/timed_backoff_policy.h",
  "//third_party/libc++/src/include/__cxx03/__tree",
  "//third_party/libc++/src/include/__cxx03/__tuple/find_index.h",
-  "//third_party/libc++/src/include/__cxx03/__tuple/ignore.h",
  "//third_party/libc++/src/include/__cxx03/__tuple/make_tuple_types.h",
  "//third_party/libc++/src/include/__cxx03/__tuple/sfinae_helpers.h",
  "//third_party/libc++/src/include/__cxx03/__tuple/tuple_element.h",
@@ -1074,7 +692,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__type_traits/aligned_union.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/alignment_of.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/can_extract_key.h",
-  "//third_party/libc++/src/include/__cxx03/__type_traits/common_reference.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/common_type.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/conditional.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/conjunction.h",
@@ -1087,12 +704,10 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__type_traits/disjunction.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/enable_if.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/extent.h",
-  "//third_party/libc++/src/include/__cxx03/__type_traits/has_unique_object_representation.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/has_virtual_destructor.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/integral_constant.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/invoke.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_abstract.h",
-  "//third_party/libc++/src/include/__cxx03/__type_traits/is_aggregate.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_allocator.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_always_bitcastable.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_arithmetic.h",
@@ -1124,7 +739,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_member_pointer.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_nothrow_assignable.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_nothrow_constructible.h",
-  "//third_party/libc++/src/include/__cxx03/__type_traits/is_nothrow_convertible.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_nothrow_destructible.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_null_pointer.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/is_object.h",
@@ -1184,18 +798,13 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__type_traits/unwrap_ref.h",
  "//third_party/libc++/src/include/__cxx03/__type_traits/void_t.h",
  "//third_party/libc++/src/include/__cxx03/__undef_macros",
-  "//third_party/libc++/src/include/__cxx03/__utility/as_const.h",
  "//third_party/libc++/src/include/__cxx03/__utility/as_lvalue.h",
  "//third_party/libc++/src/include/__cxx03/__utility/auto_cast.h",
-  "//third_party/libc++/src/include/__cxx03/__utility/cmp.h",
  "//third_party/libc++/src/include/__cxx03/__utility/convert_to_integral.h",
  "//third_party/libc++/src/include/__cxx03/__utility/declval.h",
  "//third_party/libc++/src/include/__cxx03/__utility/empty.h",
  "//third_party/libc++/src/include/__cxx03/__utility/exception_guard.h",
-  "//third_party/libc++/src/include/__cxx03/__utility/exchange.h",
  "//third_party/libc++/src/include/__cxx03/__utility/forward.h",
-  "//third_party/libc++/src/include/__cxx03/__utility/forward_like.h",
-  "//third_party/libc++/src/include/__cxx03/__utility/in_place.h",
  "//third_party/libc++/src/include/__cxx03/__utility/integer_sequence.h",
  "//third_party/libc++/src/include/__cxx03/__utility/is_pointer_in_range.h",
  "//third_party/libc++/src/include/__cxx03/__utility/is_valid_range.h",
@@ -1208,16 +817,12 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/__utility/rel_ops.h",
  "//third_party/libc++/src/include/__cxx03/__utility/small_buffer.h",
  "//third_party/libc++/src/include/__cxx03/__utility/swap.h",
-  "//third_party/libc++/src/include/__cxx03/__utility/to_underlying.h",
  "//third_party/libc++/src/include/__cxx03/__utility/unreachable.h",
  "//third_party/libc++/src/include/__cxx03/__variant/monostate.h",
  "//third_party/libc++/src/include/__cxx03/__verbose_abort",
  "//third_party/libc++/src/include/__cxx03/algorithm",
-  "//third_party/libc++/src/include/__cxx03/any",
  "//third_party/libc++/src/include/__cxx03/array",
  "//third_party/libc++/src/include/__cxx03/atomic",
-  "//third_party/libc++/src/include/__cxx03/barrier",
-  "//third_party/libc++/src/include/__cxx03/bit",
  "//third_party/libc++/src/include/__cxx03/bitset",
  "//third_party/libc++/src/include/__cxx03/cassert",
  "//third_party/libc++/src/include/__cxx03/ccomplex",
@@ -1225,7 +830,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/cerrno",
  "//third_party/libc++/src/include/__cxx03/cfenv",
  "//third_party/libc++/src/include/__cxx03/cfloat",
-  "//third_party/libc++/src/include/__cxx03/charconv",
  "//third_party/libc++/src/include/__cxx03/chrono",
  "//third_party/libc++/src/include/__cxx03/cinttypes",
  "//third_party/libc++/src/include/__cxx03/ciso646",
@@ -1233,12 +837,9 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/clocale",
  "//third_party/libc++/src/include/__cxx03/cmath",
  "//third_party/libc++/src/include/__cxx03/codecvt",
-  "//third_party/libc++/src/include/__cxx03/compare",
  "//third_party/libc++/src/include/__cxx03/complex",
  "//third_party/libc++/src/include/__cxx03/complex.h",
-  "//third_party/libc++/src/include/__cxx03/concepts",
  "//third_party/libc++/src/include/__cxx03/condition_variable",
-  "//third_party/libc++/src/include/__cxx03/coroutine",
  "//third_party/libc++/src/include/__cxx03/csetjmp",
  "//third_party/libc++/src/include/__cxx03/csignal",
  "//third_party/libc++/src/include/__cxx03/cstdarg",
@@ -1257,36 +858,17 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/deque",
  "//third_party/libc++/src/include/__cxx03/errno.h",
  "//third_party/libc++/src/include/__cxx03/exception",
-  "//third_party/libc++/src/include/__cxx03/execution",
-  "//third_party/libc++/src/include/__cxx03/expected",
  "//third_party/libc++/src/include/__cxx03/experimental/__config",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/aligned_tag.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/declaration.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/reference.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/scalar.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/simd.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/simd_mask.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/traits.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/utility.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/__simd/vec_ext.h",
-  "//third_party/libc++/src/include/__cxx03/experimental/iterator",
-  "//third_party/libc++/src/include/__cxx03/experimental/memory",
-  "//third_party/libc++/src/include/__cxx03/experimental/propagate_const",
-  "//third_party/libc++/src/include/__cxx03/experimental/simd",
-  "//third_party/libc++/src/include/__cxx03/experimental/type_traits",
  "//third_party/libc++/src/include/__cxx03/experimental/utility",
  "//third_party/libc++/src/include/__cxx03/ext/__hash",
  "//third_party/libc++/src/include/__cxx03/ext/hash_map",
  "//third_party/libc++/src/include/__cxx03/ext/hash_set",
  "//third_party/libc++/src/include/__cxx03/fenv.h",
-  "//third_party/libc++/src/include/__cxx03/filesystem",
  "//third_party/libc++/src/include/__cxx03/float.h",
-  "//third_party/libc++/src/include/__cxx03/format",
  "//third_party/libc++/src/include/__cxx03/forward_list",
  "//third_party/libc++/src/include/__cxx03/fstream",
  "//third_party/libc++/src/include/__cxx03/functional",
  "//third_party/libc++/src/include/__cxx03/future",
-  "//third_party/libc++/src/include/__cxx03/initializer_list",
  "//third_party/libc++/src/include/__cxx03/inttypes.h",
  "//third_party/libc++/src/include/__cxx03/iomanip",
  "//third_party/libc++/src/include/__cxx03/ios",
@@ -1294,35 +876,23 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/iostream",
  "//third_party/libc++/src/include/__cxx03/istream",
  "//third_party/libc++/src/include/__cxx03/iterator",
-  "//third_party/libc++/src/include/__cxx03/latch",
  "//third_party/libc++/src/include/__cxx03/limits",
  "//third_party/libc++/src/include/__cxx03/list",
  "//third_party/libc++/src/include/__cxx03/locale",
  "//third_party/libc++/src/include/__cxx03/locale.h",
  "//third_party/libc++/src/include/__cxx03/map",
  "//third_party/libc++/src/include/__cxx03/math.h",
-  "//third_party/libc++/src/include/__cxx03/mdspan",
  "//third_party/libc++/src/include/__cxx03/memory",
-  "//third_party/libc++/src/include/__cxx03/memory_resource",
  "//third_party/libc++/src/include/__cxx03/module.modulemap",
  "//third_party/libc++/src/include/__cxx03/mutex",
  "//third_party/libc++/src/include/__cxx03/new",
-  "//third_party/libc++/src/include/__cxx03/numbers",
  "//third_party/libc++/src/include/__cxx03/numeric",
-  "//third_party/libc++/src/include/__cxx03/optional",
  "//third_party/libc++/src/include/__cxx03/ostream",
-  "//third_party/libc++/src/include/__cxx03/print",
  "//third_party/libc++/src/include/__cxx03/queue",
  "//third_party/libc++/src/include/__cxx03/random",
-  "//third_party/libc++/src/include/__cxx03/ranges",
  "//third_party/libc++/src/include/__cxx03/ratio",
  "//third_party/libc++/src/include/__cxx03/regex",
-  "//third_party/libc++/src/include/__cxx03/scoped_allocator",
-  "//third_party/libc++/src/include/__cxx03/semaphore",
  "//third_party/libc++/src/include/__cxx03/set",
-  "//third_party/libc++/src/include/__cxx03/shared_mutex",
-  "//third_party/libc++/src/include/__cxx03/source_location",
-  "//third_party/libc++/src/include/__cxx03/span",
  "//third_party/libc++/src/include/__cxx03/sstream",
  "//third_party/libc++/src/include/__cxx03/stack",
  "//third_party/libc++/src/include/__cxx03/stdatomic.h",
@@ -1332,17 +902,14 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/stdint.h",
  "//third_party/libc++/src/include/__cxx03/stdio.h",
  "//third_party/libc++/src/include/__cxx03/stdlib.h",
-  "//third_party/libc++/src/include/__cxx03/stop_token",
  "//third_party/libc++/src/include/__cxx03/streambuf",
  "//third_party/libc++/src/include/__cxx03/string",
  "//third_party/libc++/src/include/__cxx03/string.h",
  "//third_party/libc++/src/include/__cxx03/string_view",
  "//third_party/libc++/src/include/__cxx03/strstream",
-  "//third_party/libc++/src/include/__cxx03/syncstream",
  "//third_party/libc++/src/include/__cxx03/system_error",
  "//third_party/libc++/src/include/__cxx03/tgmath.h",
  "//third_party/libc++/src/include/__cxx03/thread",
-  "//third_party/libc++/src/include/__cxx03/tuple",
  "//third_party/libc++/src/include/__cxx03/type_traits",
  "//third_party/libc++/src/include/__cxx03/typeindex",
  "//third_party/libc++/src/include/__cxx03/typeinfo",
@@ -1351,7 +918,6 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__cxx03/unordered_set",
  "//third_party/libc++/src/include/__cxx03/utility",
  "//third_party/libc++/src/include/__cxx03/valarray",
-  "//third_party/libc++/src/include/__cxx03/variant",
  "//third_party/libc++/src/include/__cxx03/vector",
  "//third_party/libc++/src/include/__cxx03/version",
  "//third_party/libc++/src/include/__cxx03/wchar.h",
@@ -1390,6 +956,10 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__flat_map/sorted_equivalent.h",
  "//third_party/libc++/src/include/__flat_map/sorted_unique.h",
  "//third_party/libc++/src/include/__flat_map/utils.h",
+  "//third_party/libc++/src/include/__flat_set/flat_multiset.h",
+  "//third_party/libc++/src/include/__flat_set/flat_set.h",
+  "//third_party/libc++/src/include/__flat_set/ra_iterator.h",
+  "//third_party/libc++/src/include/__flat_set/utils.h",
  "//third_party/libc++/src/include/__format/buffer.h",
  "//third_party/libc++/src/include/__format/concepts.h",
  "//third_party/libc++/src/include/__format/container_adaptor.h",
@@ -1460,12 +1030,14 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__fwd/get.h",
  "//third_party/libc++/src/include/__fwd/ios.h",
  "//third_party/libc++/src/include/__fwd/istream.h",
+  "//third_party/libc++/src/include/__fwd/map.h",
  "//third_party/libc++/src/include/__fwd/mdspan.h",
  "//third_party/libc++/src/include/__fwd/memory.h",
  "//third_party/libc++/src/include/__fwd/memory_resource.h",
  "//third_party/libc++/src/include/__fwd/ostream.h",
  "//third_party/libc++/src/include/__fwd/pair.h",
  "//third_party/libc++/src/include/__fwd/queue.h",
+  "//third_party/libc++/src/include/__fwd/set.h",
  "//third_party/libc++/src/include/__fwd/span.h",
  "//third_party/libc++/src/include/__fwd/sstream.h",
  "//third_party/libc++/src/include/__fwd/stack.h",
@@ -1559,6 +1131,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__math/traits.h",
  "//third_party/libc++/src/include/__math/trigonometric_functions.h",
  "//third_party/libc++/src/include/__mbstate_t.h",
+  "//third_party/libc++/src/include/__mdspan/aligned_accessor.h",
  "//third_party/libc++/src/include/__mdspan/default_accessor.h",
  "//third_party/libc++/src/include/__mdspan/extents.h",
  "//third_party/libc++/src/include/__mdspan/layout_left.h",
@@ -1583,6 +1156,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__memory/destroy.h",
  "//third_party/libc++/src/include/__memory/destruct_n.h",
  "//third_party/libc++/src/include/__memory/inout_ptr.h",
+  "//third_party/libc++/src/include/__memory/is_sufficiently_aligned.h",
  "//third_party/libc++/src/include/__memory/noexcept_move_assign_container.h",
  "//third_party/libc++/src/include/__memory/out_ptr.h",
  "//third_party/libc++/src/include/__memory/pointer_traits.h",
@@ -1632,6 +1206,7 @@ libcxx_headers = [
  "//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/ranges_iota.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",
@@ -1846,7 +1421,6 @@ libcxx_headers = [
  "//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",
-  "//third_party/libc++/src/include/__type_traits/is_nothrow_convertible.h",
  "//third_party/libc++/src/include/__type_traits/is_nothrow_destructible.h",
  "//third_party/libc++/src/include/__type_traits/is_null_pointer.h",
  "//third_party/libc++/src/include/__type_traits/is_object.h",
@@ -1888,6 +1462,8 @@ libcxx_headers = [
  "//third_party/libc++/src/include/__type_traits/negation.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/reference_constructs_from_temporary.h",
+  "//third_party/libc++/src/include/__type_traits/reference_converts_from_temporary.h",
  "//third_party/libc++/src/include/__type_traits/remove_all_extents.h",
  "//third_party/libc++/src/include/__type_traits/remove_const.h",
  "//third_party/libc++/src/include/__type_traits/remove_const_ref.h",
@@ -2012,6 +1588,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/fenv.h",
  "//third_party/libc++/src/include/filesystem",
  "//third_party/libc++/src/include/flat_map",
+  "//third_party/libc++/src/include/flat_set",
  "//third_party/libc++/src/include/float.h",
  "//third_party/libc++/src/include/format",
  "//third_party/libc++/src/include/forward_list",
@@ -2035,7 +1612,7 @@ libcxx_headers = [
  "//third_party/libc++/src/include/mdspan",
  "//third_party/libc++/src/include/memory",
  "//third_party/libc++/src/include/memory_resource",
-  "//third_party/libc++/src/include/module.modulemap",
+  "//third_party/libc++/src/include/module.modulemap.in",
  "//third_party/libc++/src/include/mutex",
  "//third_party/libc++/src/include/new",
  "//third_party/libc++/src/include/numbers",
--- a/lib/browser/api/browser-window.ts
+++ b/lib/browser/api/browser-window.ts
@@ -54,7 +54,7 @@ BrowserWindow.prototype._init = function (this: BWT) {
  });
  this.on('close', (event) => {
    queueMicrotask(() => {
-      if (!unresponsiveEvent && !event.defaultPrevented) {
+      if (!unresponsiveEvent && !event?.defaultPrevented) {
        unresponsiveEvent = setTimeout(emitUnresponsiveEvent, 5000);
      }
    });
--- a/lib/browser/api/menu-item-roles.ts
+++ b/lib/browser/api/menu-item-roles.ts
@@ -78,7 +78,9 @@ export const roleList: Record<RoleId, Role> = {
  minimize: {
    label: 'Minimize',
    accelerator: 'CommandOrControl+M',
-    windowMethod: w => w.minimize()
+    windowMethod: w => {
+      if (w.minimizable) w.minimize();
+    }
  },
  paste: {
    label: 'Paste',
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -263,8 +263,17 @@ WebContents.prototype.print = function (options: ElectronInternal.WebContentsPri
    throw new TypeError('webContents.print(): Invalid print settings specified.');
  }

-  const pageSize = options.pageSize ?? 'A4';
-  if (typeof pageSize === 'object') {
+  const { pageSize } = options;
+  if (typeof pageSize === 'string' && PDFPageSizes[pageSize]) {
+    const mediaSize = PDFPageSizes[pageSize];
+    options.mediaSize = {
+      ...mediaSize,
+      imageable_area_left_microns: 0,
+      imageable_area_bottom_microns: 0,
+      imageable_area_right_microns: mediaSize.width_microns,
+      imageable_area_top_microns: mediaSize.height_microns
+    };
+  } else if (typeof pageSize === 'object') {
    if (!pageSize.height || !pageSize.width) {
      throw new Error('height and width properties are required for pageSize');
    }
@@ -286,16 +295,7 @@ WebContents.prototype.print = function (options: ElectronInternal.WebContentsPri
      imageable_area_right_microns: width,
      imageable_area_top_microns: height
    };
-  } else if (typeof pageSize === 'string' && PDFPageSizes[pageSize]) {
-    const mediaSize = PDFPageSizes[pageSize];
-    options.mediaSize = {
-      ...mediaSize,
-      imageable_area_left_microns: 0,
-      imageable_area_bottom_microns: 0,
-      imageable_area_right_microns: mediaSize.width_microns,
-      imageable_area_top_microns: mediaSize.height_microns
-    };
-  } else {
+  } else if (pageSize !== undefined) {
    throw new Error(`Unsupported pageSize: ${pageSize}`);
  }

--- a/lib/browser/init.ts
+++ b/lib/browser/init.ts
@@ -218,7 +218,6 @@ if (packagePath) {
  } else {
    // Call appCodeLoaded before just for safety, it doesn't matter here as _load is synchronous
    appCodeLoaded!();
-    process._firstFileName = Module._resolveFilename(path.join(packagePath, mainStartupScript), null, false);
    Module._load(path.join(packagePath, mainStartupScript), Module, true);
  }
 } else {
--- a/patches/boringssl/expose_ripemd160.patch
+++ b/patches/boringssl/expose_ripemd160.patch
@@ -10,7 +10,7 @@ this patch is required to provide ripemd160 support in the nodejs crypto
 module.

 diff --git a/crypto/digest/digest_extra.cc b/crypto/digest/digest_extra.cc
-index f68ede9156ee57526f4578953c350798a1299f00..1de18075e1cfa7f9660fa3b065cd20bafcbe7ee8 100644
+index 4cbfa1f53bb669c24c7f055f4fee7f144f72115a..120cb84e07e0539c038bca059b794d8f9f932a51 100644
 --- a/crypto/digest/digest_extra.cc
 +++ b/crypto/digest/digest_extra.cc
@@ -45,6 +45,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
@@ -82,7 +82,7 @@ index e04b80cd6a1a215fc87f8fd8d750c3d258c3974f..8fdf1c624794f568bfc77b7b6b0c510b
 
 void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index 5ddc2d3b4cfb8a87eb22fb707230f56dcb7ccb3e..dea3c5b3adf49e1b4aab197e822744c80964afac 100644
+index 6abab7693ef2cf418e64d4bf5d53e7e0821cb731..ecbf81be6888cf2e95008da054cf4d3d7df6ad49 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
--- a/patches/boringssl/feat_expose_several_extra_cipher_functions.patch
+++ b/patches/boringssl/feat_expose_several_extra_cipher_functions.patch
@@ -118,7 +118,7 @@ index 8fdf1c624794f568bfc77b7b6b0c510b23905a4d..2e40c031e8c681fe921331b26dbf63f4
   callback(EVP_des_ede3_cbc(), "des-ede3-cbc", NULL, arg);
   callback(EVP_rc2_cbc(), "rc2-cbc", NULL, arg);
 diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
-index 6bb135801326bc1cbe2b93f02e561e38c90abeca..06bcba4451456c72b168266859482343af76a931 100644
+index 13e68ad20ac08a462bb577d7f99e2c6f167579fa..4960d0eeb8f31bec4347ed2a1b63beba530de700 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
@@ -448,6 +448,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
--- 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 2cdcbc346175eeee69402ecee7f169e61c655199..f7226fe711e4214b216ea2c5173a0212
 
     case ssl_open_record_error:
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index 10b062abf8304df32652c57f377d57209bb47ed1..4eefe928daaf959d0cb1f0820e01ee05754bb4d5 100644
+index 69f3fe2f5c193a30dd90368048804109db563da3..52393736adee2d50de218ac86c9e7cbcd9d6bf6d 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
-@@ -1206,7 +1206,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
+@@ -1204,7 +1204,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
   }
 
   if (ret_code == 0) {
@@ -32,7 +32,7 @@ index 10b062abf8304df32652c57f377d57209bb47ed1..4eefe928daaf959d0cb1f0820e01ee05
       return SSL_ERROR_ZERO_RETURN;
     }
     // An EOF was observed which violates the protocol, and the underlying
-@@ -2573,13 +2573,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
+@@ -2571,13 +2571,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
@@ -50,7 +50,6 @@ upload_list_add_loadsync_method.patch
 allow_setting_secondary_label_via_simplemenumodel.patch
 feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
 adjust_accessibility_ui_for_electron.patch
-skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
@@ -131,7 +130,7 @@ osr_shared_texture_remove_keyed_mutex_on_win_dxgi.patch
 feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
 chore_partial_revert_of.patch
 fix_software_compositing_infinite_loop.patch
-fix_add_method_which_disables_headless_mode_on_native_widget.patch
+fix_adjust_headless_mode_handling_in_native_widget.patch
 refactor_unfilter_unresponsive_events.patch
 build_disable_thin_lto_mac.patch
 feat_corner_smoothing_css_rule_and_blink_painting.patch
@@ -142,6 +141,7 @@ ignore_parse_errors_for_resolveshortcutproperties.patch
 feat_add_signals_when_embedder_cleanup_callbacks_run_for.patch
 feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
 fix_win32_synchronous_spellcheck.patch
-chore_remove_conflicting_allow_unsafe_libc_calls.patch
+fix_enable_wrap_iter_in_string_view_and_array.patch
 fix_linter_error.patch
-fix_take_snapped_status_into_account_when_showing_a_window.patch
+chore_grandfather_in_electron_views_and_delegates.patch
+refactor_patch_electron_permissiontypes_into_blink.patch
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -5,12 +5,11 @@ Subject: fix: improve shortcut text of Accelerator

 This patch makes three changes to Accelerator::GetShortcutText to improve shortcut display text in menus:

-1. Ctrl-Alt-<Key> accelerators show as Ctrl-Alt-<Key> instead of as Ctrl-<Key>
-2. F2-F24 accelerators show up as such
-3. Ctrl-Shift-= and Ctrl-Plus show up as such
+1. F2-F24 accelerators show up as such
+2. Ctrl-Shift-= and Ctrl-Plus show up as such

 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 5590f9d425229d87373c5b53651d2e2d17b779e4..407cbd7e7811e3053e35e26f24e3c049cdd59a46 100644
+index 5ad9332dd27ceda7d67cd3f571b12218a4415a40..ffe083836c39fb60b4bff1f9fbdd6cebb7fa9d1d 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
@@ -12,6 +12,7 @@
@@ -21,51 +20,51 @@ index 5590f9d425229d87373c5b53651d2e2d17b779e4..407cbd7e7811e3053e35e26f24e3c049
 #include "base/strings/utf_string_conversions.h"
 #include "base/types/cxx23_to_underlying.h"
 #include "build/build_config.h"
-@@ -109,6 +110,11 @@ std::u16string Accelerator::GetShortcutText() const {
+@@ -164,6 +165,11 @@ std::u16string Accelerator::GetKeyCodeStringForShortcut() const {
 #endif
 
-   if (shortcut.empty()) {
+   if (key_string.empty()) {
 +    // When a shifted char is explicitly specified, for example Ctrl+Plus,
 +    // use the shifted char directly.
 +    if (shifted_char) {
-+      shortcut += *shifted_char;
+      key_string += *shifted_char;
 +    } else {
 #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
-@@ -133,6 +139,10 @@ std::u16string Accelerator::GetShortcutText() const {
-       shortcut +=
+@@ -190,6 +196,10 @@ std::u16string Accelerator::GetKeyCodeStringForShortcut() const {
           static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
+     }
 #endif
 +    }
 +    if (key_code_ > VKEY_F1 && key_code_ <= VKEY_F24)
-+      shortcut = base::UTF8ToUTF16(
+      key_string = base::UTF8ToUTF16(
 +          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
   }
 
- #if BUILDFLAG(IS_MAC)
-@@ -317,7 +327,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
-     const std::u16string& shortcut) const {
-   std::u16string result = shortcut;
+   return key_string;
+@@ -350,7 +360,7 @@ std::vector<std::u16string> Accelerator::GetLongFormModifiers() const {
+     modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_CTRL_KEY));
+   }
 
 -  if (IsShiftDown()) {
 +  if (!shifted_char && IsShiftDown()) {
-     result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
+     modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_SHIFT_KEY));
   }
 
 diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
-index 198c7469f410d3516b8a18493c5e4588d02487c2..e4995824ae2f3bb8045a3841a6213a4b315845a8 100644
+index e7d5adfac920c97df8bab9bf4ed69a835ee314a9..9aeea7cb4c48d1ccc27304fa99238151b2811c87 100644
 --- a/ui/base/accelerators/accelerator.h
 +++ b/ui/base/accelerators/accelerator.h
@@ -18,6 +18,7 @@
- #include <utility>
+ #include <vector>
 
 #include "base/component_export.h"
 +#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "base/time/time.h"
 #include "build/blink_buildflags.h"
 #include "build/build_config.h"
-@@ -185,6 +186,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
+@@ -189,6 +190,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
     return interrupted_by_mouse_event_;
   }
 
@@ -73,4 +72,4 @@ index 198c7469f410d3516b8a18493c5e4588d02487c2..e4995824ae2f3bb8045a3841a6213a4b
 +
  private:
   friend class AcceleratorTestMac;
-   std::u16string ApplyLongFormModifiers(const std::u16string& shortcut) const;
+   std::vector<std::u16string> GetLongFormModifiers() const;
--- 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 0d8bb93bf146c3058a30693673f0c23fdea90ae8..55f76337a445345c06531ce05e603db30daf759f 100644
+index cadb96febde3fb3fe90929873b1db452a6d8fb8f..09f5504127b5a5ec3d0d69d9eb6d0cd93e0e75cd 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -268,6 +268,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -254,6 +254,10 @@ int GpuMain(MainFunctionParams parameters) {
   // to the GpuProcessHost once the GpuServiceImpl has started.
   viz::GpuServiceImpl::InstallPreInitializeLogHandler();
 
@@ -24,7 +24,7 @@ index 0d8bb93bf146c3058a30693673f0c23fdea90ae8..55f76337a445345c06531ce05e603db3
   // 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
-@@ -378,7 +382,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -363,7 +367,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,7 +10,7 @@ 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 44da0544b778d6ff4c14b6f4e8463cb8260d2f0d..8ae8939af4141a684b7a6d50a43e1abb354ea028 100644
+index db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c96921d400 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
@@ -149,6 +149,8 @@ class CONTENT_EXPORT RenderFrameObserver
@@ -23,10 +23,10 @@ index 44da0544b778d6ff4c14b6f4e8463cb8260d2f0d..8ae8939af4141a684b7a6d50a43e1abb
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 0fb92081a1bbfb14c0ddd74dfe91f94bb2be1d2a..886f677564084d8b6af15b03403cfa56aeddd3c9 100644
+index 6c569b4a0f4ddea5d071753bb4a72002ba174171..d1085ca830b5a98f1550e6c01728cd760df6141a 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4802,6 +4802,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
@@ -40,10 +40,10 @@ index 0fb92081a1bbfb14c0ddd74dfe91f94bb2be1d2a..886f677564084d8b6af15b03403cfa56
                                                int world_id) {
   for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index bf073c9180d47243f09fdd052a43dfe7e34aa4aa..d1642b675e474568c302553a288253b639ed1efd 100644
+index a7383e4a5ccb8ca1de10bc3efb3043f1dbbf2f6f..41075015aa2dd347c9847072dd76f9cea9ad2d94 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -653,6 +653,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -652,6 +652,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 bf073c9180d47243f09fdd052a43dfe7e34aa4aa..d1642b675e474568c302553a288253b6
                                 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 038c13c1e697d4f21160e0329f659b609802ecc1..60fd9aa69a86c32abf79ef8737e810b0017e1083 100644
+index f59582f677806c07381bc608f9cca84a7af51a2b..174113297c8e5a5928c1d9166c417cb6328cfc82 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -664,6 +664,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -661,6 +661,9 @@ class BLINK_EXPORT WebLocalFrameClient {
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) {}
 
@@ -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 8bb6b0465069529f79aaec21792e8b159535b3e9..f9782531c639d07002dda07732750a0007109468 100644
+index e52a535450964b0938b66f7506225fda0cde04a2..841e9b36df4c32040d2b3c71514266fc330c99c7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -299,6 +299,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
 
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index 8bb6b0465069529f79aaec21792e8b159535b3e9..f9782531c639d07002dda07732750a00
                                         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 66cc44003157657c68e90d295f877789395eca8d..19cd8460711d5d5b1b76c9e4cb82ed7fc71b410c 100644
+index 479dd8a7294ca6f0abb72350cc1a6c61e09c7c27..45226050aea1036f2c3a2fc15cabee893d12b1a7 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
@@ -295,6 +295,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 66cc44003157657c68e90d295f877789395eca8d..19cd8460711d5d5b1b76c9e4cb82ed7f
     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 4c7375a27a22f04694e14fecc17d633734d4cccc..ea2a32b151aaf07b5704e463d01714eb41680afb 100644
+index 5dbc9c1f5f45c8753dd5510ffad2c5d4c20c814b..4223ba0db6c267a4574ab4a76c5a6f365223416c 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
@@ -82,6 +82,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 4c7375a27a22f04694e14fecc17d633734d4cccc..ea2a32b151aaf07b5704e463d01714eb
                                 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 8ca461c8fc3f2e508be5783406b570062ccf5de0..3c67d214ecd2b3b2f3e8955836e8ef7c0f0a525d 100644
+index 069ccf925bc0c6f1a5b707670cc3c931dd2a25a9..49ccc167276ed544c800483c4a8655b254304ee8 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -416,6 +416,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -418,6 +418,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
 
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int32_t world_id) override {}
--- 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 12ad657f5df3ff4af2bdbd8b9fb7959131db2970..f2b03596dd5ff96236272b6348336515df85eef0 100755
+index b0807ee3d8ebcf34f0d740362aa46c8631562d38..118d200b74953c0068ad59300ccc0e3041d77a10 100755
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -336,6 +336,31 @@ SPECIAL_CASES = {
+@@ -337,6 +337,31 @@ SPECIAL_CASES = {
         "License": "Apache 2.0",
         "License File": ["//third_party/dawn/third_party/khronos/LICENSE"],
     },
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -8,10 +8,10 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643

 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index fd162a607424bd4d0b324ccc7270522eb3b6a991..df1d5564a52ef67b447bbc222ceb1f864eb3dd81 100644
+index 8064a2c27d747d4862503526496a65987df7dc35..c92596713c6d3884be3f63bf78d9117b7ad3ec90 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
-@@ -230,6 +230,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
+@@ -237,6 +237,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
   }
 }
 
@@ -29,7 +29,7 @@ index fd162a607424bd4d0b324ccc7270522eb3b6a991..df1d5564a52ef67b447bbc222ceb1f86
   objects_.clear();
   raw_objects_.clear();
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-index d8fd611e88c22f2c1319da769dcd14cc218f9c90..f17304e1e9fd202dc4e1b7724031dc4c333a4baf 100644
+index 939a99b2a086d5373f82fe96da73dabe02f6f9d8..fccc200b1b11076c8fcffde071a53598ffba9a12 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.h
 +++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -87,6 +87,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
--- 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 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb491ec14b2 100644
+index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793477c6d19 100644
 --- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
@@ -48,6 +48,7 @@
@@ -21,7 +21,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/ax_updates_and_events.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
-@@ -171,7 +172,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
+@@ -169,7 +170,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
                                rvh->GetRoutingID(), accessibility_mode);
 }
 
@@ -30,17 +30,17 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
 base::Value::Dict BuildTargetDescriptor(Browser* browser) {
   base::Value::Dict target_data;
   target_data.Set(kSessionIdField, browser->session_id().id());
-@@ -192,7 +193,7 @@ void HandleAccessibilityRequestCallback(
-   DCHECK(ShouldHandleAccessibilityRequestCallback(path));
- 
+@@ -193,7 +194,7 @@ void HandleAccessibilityRequestCallback(
+   auto& browser_accessibility_state =
+       *content::BrowserAccessibilityState::GetInstance();
   base::Value::Dict data;
 -  PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
 +  PrefService* pref = static_cast<electron::ElectronBrowserContext*>(current_context)->prefs();
-   ui::AXMode mode =
-       content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
-   bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
-@@ -221,7 +222,7 @@ void HandleAccessibilityRequestCallback(
-   data.Set(kPDFPrinting, pdf_printing ? kOn : kOff);
+   ui::AXMode mode = browser_accessibility_state.GetAccessibilityMode();
+   bool native = mode.has_mode(ui::AXMode::kNativeAPIs);
+   bool web = mode.has_mode(ui::AXMode::kWebContents);
+@@ -246,7 +247,7 @@ void HandleAccessibilityRequestCallback(
+                           initial_process_mode.has_mode(ui::AXMode::kHTML)));
 
   std::string pref_api_type =
 -      pref->GetString(prefs::kShownAccessibilityApiType);
@@ -48,7 +48,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
   bool pref_api_type_supported = false;
 
   std::vector<ui::AXApiType::Type> supported_api_types =
-@@ -288,11 +289,11 @@ void HandleAccessibilityRequestCallback(
+@@ -314,11 +315,11 @@ void HandleAccessibilityRequestCallback(
   data.Set(kPagesField, std::move(page_list));
 
   base::Value::List browser_list;
@@ -62,7 +62,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
   data.Set(kBrowsersField, std::move(browser_list));
 
   std::string json_string;
-@@ -762,7 +763,8 @@ void AccessibilityUIMessageHandler::SetGlobalString(
+@@ -792,7 +793,8 @@ void AccessibilityUIMessageHandler::SetGlobalString(
   const std::string value = CheckJSValue(data.FindString(kValueField));
 
   if (string_name == kApiTypeField) {
@@ -72,7 +72,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
     pref->SetString(prefs::kShownAccessibilityApiType, value);
   }
 }
-@@ -816,7 +818,8 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -846,7 +848,8 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                      AXPropertyFilter::ALLOW_EMPTY);
   AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
 
@@ -82,7 +82,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
   ui::AXApiType::Type api_type =
       ui::AXApiType::From(pref->GetString(prefs::kShownAccessibilityApiType));
   std::string accessibility_contents =
-@@ -843,6 +846,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -873,6 +876,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                      AXPropertyFilter::ALLOW_EMPTY);
   AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
 
@@ -90,7 +90,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
   for (Browser* browser : *BrowserList::GetInstance()) {
     if (browser->session_id().id() == session_id) {
       base::Value::Dict result = BuildTargetDescriptor(browser);
-@@ -855,6 +859,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -885,6 +889,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
       return;
     }
   }
@@ -98,7 +98,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
 #endif  // !BUILDFLAG(IS_ANDROID)
   // No browser with the specified |session_id| was found.
   base::Value::Dict result;
-@@ -898,11 +903,13 @@ void AccessibilityUIMessageHandler::StopRecording(
+@@ -928,11 +933,13 @@ void AccessibilityUIMessageHandler::StopRecording(
 }
 
 ui::AXApiType::Type AccessibilityUIMessageHandler::GetRecordingApiType() {
@@ -115,7 +115,7 @@ index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb4
   // Check to see if it is in the supported types list.
   if (std::find(supported_types.begin(), supported_types.end(), api_type) ==
       supported_types.end()) {
-@@ -972,8 +979,11 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+@@ -1002,8 +1009,11 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
 // static
 void AccessibilityUIMessageHandler::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ 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 6c679ef877067297ec3bf1a23af6c03a2af8dcf5..1ac93433189580c13b69cd52ce62681a8620da3d 100644
+index 495daa75895a4545287da53f305e6cd348db7183..fd749047a7d505d02c4e8e4631da823275c27822 100644
 --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
-@@ -168,6 +168,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
+@@ -166,6 +166,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
               (network::mojom::AttributionSupport support),
               (override));
 
@@ -23,10 +23,10 @@ index 6c679ef877067297ec3bf1a23af6c03a2af8dcf5..1ac93433189580c13b69cd52ce62681a
     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 6c1e46e58d975137eee6c0fd7b01d2ae970a2e10..5ca29616369e76e298eb03188e18ca545c76a162 100644
+index 4a70fd017915c1d631a47096c735d9c4b6e2c2af..0b2eb574f86e4c192d7cd986abea72e85163a7bd 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -765,6 +765,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -759,6 +759,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
   GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
 }
 
@@ -51,7 +51,7 @@ index 56e52f079d1ad7c7a22764b976f0c8b2cc48dff2..1231fe522ad103e94d3c30ad7d5e5d23
   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 19d2df47b0c929558ac8cfc208742dfef463a68b..7e9f2e71f08c1324a805462064d4fa485041c19f 100644
+index d719b546b8c3c59003698b26dead065da7d76341..95a52f1cc2024e4a9cd694429d5304a5860a1c1e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -579,8 +579,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
@@ -80,7 +80,7 @@ index 20ca763ff7f55e8176b77349b41917b11e051ae6..a50c122064b5f0092f57e3d508fb1938
   // This interface should only be implemented inside content.
   friend class RenderViewHostImpl;
 diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
-index 913e465918750df6852c3ede34a75ecebab8b1fa..c81d6ad098cf977cbd8933721e539c52056c258b 100644
+index 58895f0ed0e18703c45eee37210003150c24550a..6a138d4cd852f6f2b9fd2294062c9b6ab4f08855 100644
 --- a/content/test/test_page_broadcast.h
 +++ b/content/test/test_page_broadcast.h
@@ -50,6 +50,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
@@ -92,10 +92,10 @@ index 913e465918750df6852c3ede34a75ecebab8b1fa..c81d6ad098cf977cbd8933721e539c52
   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 f868a3cc56b49b7fdac9fa1415386bd3a59a3dd7..ac7e92740bf7a61f3d8dcf8feff0fee978ffbfee 100644
+index 4614f84c3d8f709fb2a12d662e5a13dc12c59e8a..76444fcbf68b91ad64c46debc565ffc35a3e2c68 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 {
+@@ -172,4 +172,7 @@ interface PageBroadcast {
   // 2. The ColorProvider associated with the WebContents changes as a result
   // of theme changes.
   UpdateColorProviders(ColorProviderColorMaps color_provider_colors);
@@ -104,10 +104,10 @@ index f868a3cc56b49b7fdac9fa1415386bd3a59a3dd7..ac7e92740bf7a61f3d8dcf8feff0fee9
 +  SetSchedulerThrottling(bool allowed);
 };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index b1689844282d6917b9750fbc6a875848ddf84b70..f1cc159b7c3448a33a6d9e213f8fbd3b47141fb7 100644
+index 7c1eb9baabfb9e0f3645421b5cbe467862252638..00d2cd41d795cb550e16fb80944b238252e4e53c 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -371,6 +371,7 @@ class BLINK_EXPORT WebView {
+@@ -370,6 +370,7 @@ class BLINK_EXPORT WebView {
   // Scheduling -----------------------------------------------------------
 
   virtual PageScheduler* Scheduler() const = 0;
@@ -116,10 +116,10 @@ index b1689844282d6917b9750fbc6a875848ddf84b70..f1cc159b7c3448a33a6d9e213f8fbd3b
   // 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 3de7e34536eceb241de943908875a9c3e5e99f7e..10c3795839969bde6a747da67d5cc7caa44a7179 100644
+index 6b056decc43e9ba9e7970a7d8fefaed6a86d9a2d..0b2956425d2feb84f1d0db7be4f3d4b0875b1d10 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(
+@@ -2466,6 +2466,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
   TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
                "old_state", old_state, "new_state", new_state);
 
@@ -155,10 +155,10 @@ index 3de7e34536eceb241de943908875a9c3e5e99f7e..10c3795839969bde6a747da67d5cc7ca
   // 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 06f7cf79b4526ca3ec7670c234a6bb8faec32f04..b8fe2a9b7b6b4de2a689f3857c7ce44909e6f2dc 100644
+index aff99e7e1feb7addcdf631b7e3ac4209da6b502d..b759aca8d1e61c19904db146840e6f0c57a3d86a 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -448,6 +448,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -447,6 +447,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   LocalDOMWindow* PagePopupWindow() const;
 
   PageScheduler* Scheduler() const override;
@@ -166,7 +166,7 @@ index 06f7cf79b4526ca3ec7670c234a6bb8faec32f04..b8fe2a9b7b6b4de2a689f3857c7ce449
   void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                           bool is_initial_state) override;
   mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -936,6 +937,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -935,6 +936,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,10 +8,10 @@ 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 2494aeb1cd363c07e1b662743b1453da646fe17d..927dce4724263b45ff27b046ef024ae2a04706a9 100644
+index 009f3563df63bc2ba2eadeecaea4f328d6a409ec..769ff8faaddf543fba1a41aff939f23741127247 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
-@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -150,6 +150,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
   out->v8_cache_options = data.v8_cache_options();
   out->record_whole_document = data.record_whole_document();
   out->stylus_handwriting_enabled = data.stylus_handwriting_enabled();
@@ -32,7 +32,7 @@ index 2494aeb1cd363c07e1b662743b1453da646fe17d..927dce4724263b45ff27b046ef024ae2
   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 b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd715fdf82d4 100644
+index 85f312a9ea1eca0ff7ba4c679fabb3156aabbc0b..a9dc007a93003610d68e3118b4a47a86d4e16f6e 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -9,6 +9,7 @@
@@ -43,9 +43,9 @@ index b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd71
 #include "build/build_config.h"
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/blink/public/common/common_export.h"
-@@ -447,6 +448,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
-   // when feature DynamicSafeAreaInsets is enabled.
-   bool dynamic_safe_area_insets_enabled = false;
+@@ -451,6 +452,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+   // WebView and by `kWebPayments` feature flag everywhere.
+   bool payment_request_enabled = false;
 
 +  // Begin Electron-specific WebPreferences.
 +  bool context_isolation = false;
@@ -65,7 +65,7 @@ index b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd71
   // 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 d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b220554b0c4 100644
+index 1173ace39b6256edc188a4c6649e7cd4c4484899..c1d53122af52f7785a016f6fc62d9aa684a4be8c 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
@@ -8,6 +8,7 @@
@@ -76,7 +76,7 @@ index d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b22
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/blink/public/common/common_export.h"
-@@ -437,6 +438,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -442,6 +443,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
     return r.stylus_handwriting_enabled;
   }
 
@@ -130,7 +130,7 @@ index d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b22
     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 6678fc10d72e6c49ba729d5f44626f9a29934a3b..57f8c71bd0e3b1e09510184888636004a949c192 100644
+index ffd46eb579c7c6bf9263b02e9bbe0dee013ac76d..be40f76fae9653e8d3fdcfa74979089d3d317533 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -8,9 +8,11 @@ import "third_party/blink/public/mojom/css/preferred_color_scheme.mojom";
@@ -145,7 +145,7 @@ index 6678fc10d72e6c49ba729d5f44626f9a29934a3b..57f8c71bd0e3b1e09510184888636004
 enum PointerType {
   kPointerNone                              = 1,             // 1 << 0
   kPointerFirstType                         = kPointerNone,
-@@ -218,6 +220,19 @@ struct WebPreferences {
+@@ -219,6 +221,19 @@ struct WebPreferences {
   // If true, stylus handwriting recognition to text input will be available in
   // editable input fields which are non-password type.
   bool stylus_handwriting_enabled;
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ 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 9dc450bc20744463c8898bc822a558be38486493..576421cb9600625ad8b9eda25cb99954092a7a37 100644
+index 2072f6b14289b1f3a76dbccc98f29aa178c1c35c..d7017437a7e7e6ac130677e52731d0482bf20664 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -134,14 +134,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index 9dc450bc20744463c8898bc822a558be38486493..576421cb9600625ad8b9eda25cb99954
   // 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 ba6aac34b4838efa86c01926759871a31a3b2257..99ae1320be10ac19d204edfe1c1cf4f52c62eb76 100644
+index f075d02c0695ca5fe06152295179b6ec76e3597a..e5d629937aaa175d11731bc1048a1b459927e93a 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -748,10 +748,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -727,10 +727,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   }
   DCHECK(!view_ || !view_->IsAttached());
 
@@ -63,7 +63,7 @@ index ba6aac34b4838efa86c01926759871a31a3b2257..99ae1320be10ac19d204edfe1c1cf4f5
   if (!Client())
     return false;
 
-@@ -805,6 +801,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -784,6 +780,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,7 +6,7 @@ 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 12b2fb63dd3ff8c3d29d915a7d0f84a9d26c6e0a..c9fd2c069473b1c21ca8610afb246337c412e0be 100644
+index b962901a7db8e6e50155dabbb1371124b12f9b26..b01e197ae2e411a376ffa28b9058d62a16abf23b 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
@@ -48,6 +48,21 @@ all_sources = bcm_internal_headers + bcm_sources + crypto_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 45c518185da68419e0f482acba359f02c2152f88..a0e35f118f0b1f767b41676d651a575e8b5fddb4 100644
+index e9f891a025771899ffc888ea0095200342e48558..39d6f580c0cb5a0de41f32e9d7e103e05cefd0f0 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -91,6 +91,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
+@@ -102,6 +102,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
     perfetto::Category("drm"),
     perfetto::Category("drmcursor"),
     perfetto::Category("dwrite"),
--- a/patches/chromium/build_add_public_config_simdutf_config.patch
+++ b/patches/chromium/build_add_public_config_simdutf_config.patch
@@ -11,7 +11,7 @@ To accomplish this, we need to make simdutf's config public here
 for use by third_party/electron_node.

 diff --git a/third_party/simdutf/BUILD.gn b/third_party/simdutf/BUILD.gn
-index d88fe7e43ac2a8129702e58bd2cd2aea094452e3..3cbeb89587f37b0ebc3622258fea0161ebf1d7b2 100644
+index 5fbce38841f04dad38f202f529ae84c609c6a8de..9f5ef9bceade8e30bbd2be616b9143e9708fefd8 100644
 --- a/third_party/simdutf/BUILD.gn
 +++ b/third_party/simdutf/BUILD.gn
@@ -6,9 +6,14 @@ source_set("header") {
--- a/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch
+++ b/patches/chromium/build_allow_electron_mojom_interfaces_to_depend_on_blink.patch
@@ -10,10 +10,10 @@ Needed for:
 2) //electron/shell/common:web_contents_utility

 diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
-index 55921115094f7437ce10db1cac1debe9adc10ea9..7040d83af340f052f5cab4437433e3dd0a688390 100644
+index 35fc76646e912075c744b48b5ddec73f885ea5e8..6ce2825bf558d5f50b9df45227284103375aa2e4 100644
 --- a/content/public/common/BUILD.gn
 +++ b/content/public/common/BUILD.gn
-@@ -379,6 +379,8 @@ mojom("interfaces") {
+@@ -381,6 +381,8 @@ mojom("interfaces") {
     "//content/common/*",
     "//extensions/common:mojom",
     "//extensions/common:mojom_blink",
--- 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 3f6571828197301361ebde2e19e8e3138597c276..9effa81a564c3d2afae3eb2bb7438635e45f124a 100644
+index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..0ed56526002b12deb6d29f3dd23a0d74d8e7473c 100644
 --- a/.gn
 +++ b/.gn
-@@ -172,4 +172,26 @@ exec_script_allowlist =
+@@ -167,4 +167,27 @@ exec_script_allowlist =
 
       "//tools/grit/grit_rule.gni",
       "//tools/gritsettings/BUILD.gn",
@@ -34,5 +34,6 @@ index 3f6571828197301361ebde2e19e8e3138597c276..9effa81a564c3d2afae3eb2bb7438635
 +      "//third_party/electron_node/deps/sqlite/unofficial.gni",
 +      "//third_party/electron_node/deps/uv/unofficial.gni",
 +      "//third_party/electron_node/deps/uvwasi/unofficial.gni",
+      "//third_party/electron_node/deps/zstd/unofficial.gni",
 +      "//third_party/electron_node/src/inspector/unofficial.gni",
     ]
--- a/patches/chromium/build_disable_thin_lto_mac.patch
+++ b/patches/chromium/build_disable_thin_lto_mac.patch
@@ -11,7 +11,7 @@ This patch can (and should) be removed when we can prevent those symbols
 from being stripped in the release build.

 diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index 5b98b4aedab5b700d21d6a8eac11c81cc13f6b39..8ee6f54f67c300a52074f33f9d6fe08a68e3be4b 100644
+index a47aa1cf4fb55c91908e15f1c406d79a48697cf8..a05a20229749e032e6d26d87177aebc4955ce081 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
@@ -79,7 +79,7 @@ declare_args() {
--- 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 b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f2e22967b 100644
+index 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b47749874 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -199,11 +199,16 @@ if (!is_android && !is_mac) {
+@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
         "common/crash_keys.h",
       ]
 
@@ -33,10 +33,10 @@ index b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f
         "//base",
         "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 0ad542897fa8e45003a7945d9393f84844f993d3..0fb8770c97c2a3c2ffebb558cd81081821747b2a 100644
+index 73f7fc927f1c14c038e0ca91066dbb4e9bd8be62..d7d46198d11b7454d07188641f46617c924d63b1 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4567,7 +4567,7 @@ static_library("browser") {
+@@ -4633,7 +4633,7 @@ static_library("browser") {
           [ "//chrome/browser/ui/webui/signin:profile_impl" ]
     }
 
@@ -46,10 +46,10 @@ index 0ad542897fa8e45003a7945d9393f84844f993d3..0fb8770c97c2a3c2ffebb558cd810818
       # than here in :chrome_dll.
       deps += [ "//chrome:packed_resources_integrity_header" ]
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1cc7b3905eae8d1c3025ae3454482ea8418a5217..bf71a7514f337cc6447e27a8ebd3a2c299840121 100644
+index 4866689b354bc9d963638edabf1eb02d16ba984c..c5b383f2c78592a57f0d138538733937b8e76ecd 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7031,9 +7031,12 @@ test("unit_tests") {
+@@ -7210,9 +7210,12 @@ test("unit_tests") {
       "//chrome/notification_helper",
     ]
 
@@ -63,7 +63,7 @@ index 1cc7b3905eae8d1c3025ae3454482ea8418a5217..bf71a7514f337cc6447e27a8ebd3a2c2
       "//chrome//services/util_win:unit_tests",
       "//chrome/app:chrome_dll_resources",
       "//chrome/app:win_unit_tests",
-@@ -7996,6 +7999,10 @@ test("unit_tests") {
+@@ -8170,6 +8173,10 @@ test("unit_tests") {
       "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
     ]
 
@@ -74,7 +74,7 @@ index 1cc7b3905eae8d1c3025ae3454482ea8418a5217..bf71a7514f337cc6447e27a8ebd3a2c2
     sources += [
       # The importer code is not used on Android.
       "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8051,7 +8058,6 @@ test("unit_tests") {
+@@ -8225,7 +8232,6 @@ test("unit_tests") {
     # Non-android deps for "unit_tests" target.
     deps += [
       "../browser/screen_ai:screen_ai_install_state",
--- 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 bdf8b13631a3cdf698078f70c435e9316cf0bfc3..53df468e94bdd2cdf049604e29e55863efdd3a8d 100644
+index c3a3bf4970783804bc76ee4e71bb8233b5f215a8..78c72710b411e05ca0b6f01811076599fa66fc15 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,10 +7,10 @@ Build libc++ as static library to compile and pass
 nan tests

 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index 3f437d2b9c193285bdc200c2781b13de75ba993d..d9493066ddc7d7198acc76f345c726be021d8fce 100644
+index f411f2d51a397db52ba28eb7ed430f6f16c5396d..219e99e56cbf35aac8e18cff96601143f9f44ebf 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
-@@ -204,7 +204,11 @@ libcxx_modules("std_wctype_h") {
+@@ -295,7 +295,11 @@ libcxx_modules("std_wctype_h") {
 if (libcxx_is_shared) {
   _libcxx_target_type = "shared_library"
 } else {
@@ -23,7 +23,7 @@ index 3f437d2b9c193285bdc200c2781b13de75ba993d..d9493066ddc7d7198acc76f345c726be
 }
 
 target(_libcxx_target_type, "libc++") {
-@@ -213,6 +217,7 @@ target(_libcxx_target_type, "libc++") {
+@@ -304,6 +308,7 @@ target(_libcxx_target_type, "libc++") {
   # need to explicitly depend on libc++.
   visibility = [
     "//build/config:common_deps",
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.

 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 447c0ae162f45eb157008e62cbc756d6f23e4920..27db5dbfd05106788feda9daab9d1aaaf1ae920f 100644
+index ddfefbacebd5d89e112a15f29328c9674f7df3ae..ef8a80d2148c0ec0d8a3493ae58a4e723a9601e1 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -9635,6 +9635,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -9776,6 +9776,7 @@ void RenderFrameHostImpl::CreateNewWindow(
           last_committed_origin_, params->window_container_type,
           params->target_url, params->referrer.To<Referrer>(),
           params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 447c0ae162f45eb157008e62cbc756d6f23e4920..27db5dbfd05106788feda9daab9d1aaa
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c53ab4b96a16b7326dfde14452b20d2170aecf04..e500fe77f55836b3e5832536f98cf9581984b8c1 100644
+index cb039c0ac747feefd5e8a13ed03715508ae874d0..b6fc96993cdea489450978495ca4c1f3c58166af 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5061,6 +5061,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5139,6 +5139,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
                                                opener);
 
@@ -37,7 +37,7 @@ index c53ab4b96a16b7326dfde14452b20d2170aecf04..e500fe77f55836b3e5832536f98cf958
   // If the new frame has a name, make sure any SiteInstances that can find
   // this named frame have proxies for it.  Must be called after
   // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
-@@ -5102,12 +5108,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5180,12 +5186,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
     AddWebContentsDestructionObserver(new_contents_impl);
   }
 
@@ -51,10 +51,10 @@ index c53ab4b96a16b7326dfde14452b20d2170aecf04..e500fe77f55836b3e5832536f98cf958
                              new_contents_impl, opener, params.target_url,
                              params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 8f8f79733c956fed2469e51993bad29689c11d8a..17e953f46d479f431fa06d28857901cb844ff4ea 100644
+index d1e8581724adeca8b6776ded7e7c7e921f68905c..6c4abeaf847328f73b4e53a552a038b29421d9aa 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -642,6 +642,10 @@ struct CreateNewWindowParams {
+@@ -645,6 +645,10 @@ struct CreateNewWindowParams {
   pending_associated_remote<blink.mojom.Widget> widget;
   pending_associated_receiver<blink.mojom.FrameWidgetHost> frame_widget_host;
   pending_associated_remote<blink.mojom.FrameWidget> frame_widget;
@@ -66,10 +66,10 @@ index 8f8f79733c956fed2469e51993bad29689c11d8a..17e953f46d479f431fa06d28857901cb
 
 // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index f5b028759f86f382230867e6abf72a82051c02c3..f1110385258f057be3b456198b46e4d2c54ca718 100644
+index 1f5468c6f81db64929fbfc6715a586c69a29afc9..4c37155c240c3ef2c54523cfe12e0c0054a6e603 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -815,6 +815,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -828,6 +828,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -79,10 +79,10 @@ index f5b028759f86f382230867e6abf72a82051c02c3..f1110385258f057be3b456198b46e4d2
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 1c7e6dc3b867c0e598f8517591ffb9aa8007bfea..7459b083156d1f6bc01198690c4c9ec02d88d862 100644
+index a0f6c7e63a32d4cfc8a8e25cdbd90f23dbce8f24..4a995e6c35abba567bb8be826effb06ba7e2119a 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -198,6 +198,7 @@ class NetworkService;
+@@ -199,6 +199,7 @@ class NetworkService;
 class TrustedURLLoaderHeaderClient;
 }  // namespace mojom
 struct ResourceRequest;
@@ -90,7 +90,7 @@ index 1c7e6dc3b867c0e598f8517591ffb9aa8007bfea..7459b083156d1f6bc01198690c4c9ec0
 }  // namespace network
 
 namespace sandbox {
-@@ -1368,6 +1369,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1385,6 +1386,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@@ -100,7 +100,7 @@ index 1c7e6dc3b867c0e598f8517591ffb9aa8007bfea..7459b083156d1f6bc01198690c4c9ec0
       bool opener_suppressed,
       bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index ac4deeb6acebf79987591756320e2406d74d7a1e..f688e6d1e6c11f0dd80f498e6361fa822e8c2eb8 100644
+index b390356721fa226c348923f33601c4a1a2d9702d..97a3ea6f292563a41fd41f812ac72526a96d8471 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -32,6 +32,17 @@ namespace content {
@@ -122,7 +122,7 @@ index ac4deeb6acebf79987591756320e2406d74d7a1e..f688e6d1e6c11f0dd80f498e6361fa82
     WebContents* source,
     const OpenURLParams& params,
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index ac2e7cdceb13ce07966a908fab3ff8feff969484..96cb58b1a88499cf8f78d748dc5a1cc1c6b6a128 100644
+index da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f7727570c4ba 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
@@ -18,6 +18,7 @@
@@ -133,7 +133,7 @@ index ac2e7cdceb13ce07966a908fab3ff8feff969484..96cb58b1a88499cf8f78d748dc5a1cc1
 #include "content/public/browser/eye_dropper.h"
 #include "content/public/browser/fullscreen_types.h"
 #include "content/public/browser/invalidate_type.h"
-@@ -375,6 +376,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -376,6 +377,13 @@ class CONTENT_EXPORT WebContentsDelegate {
       const StoragePartitionConfig& partition_config,
       SessionStorageNamespace* session_storage_namespace);
 
@@ -148,10 +148,10 @@ index ac2e7cdceb13ce07966a908fab3ff8feff969484..96cb58b1a88499cf8f78d748dc5a1cc1
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 0e2524de1159d7e2628c66d188002c6a417bfa52..0fb92081a1bbfb14c0ddd74dfe91f94bb2be1d2a 100644
+index 4d40964aa6bb93759dd73f63e48a36c66b50a61d..6c569b4a0f4ddea5d071753bb4a72002ba174171 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -6924,6 +6924,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
+@@ -6938,6 +6938,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
           request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
           GetWebFrame()->IsAdScriptInStack());
 
@@ -163,10 +163,10 @@ index 0e2524de1159d7e2628c66d188002c6a417bfa52..0fb92081a1bbfb14c0ddd74dfe91f94b
   // moved on send.
   bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index fa36b9907988ab971c94eae317e6e1dc4d170762..a2cafef6cae2fd78580fdf90dae17ac6586a7312 100644
+index e5f7596c1b3e525e1d64efbd6b7e0703b980dac9..0b4523200651c1edfd7678b177a24b7e64de6ddf 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -534,6 +534,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -538,6 +538,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -176,10 +176,10 @@ index fa36b9907988ab971c94eae317e6e1dc4d170762..a2cafef6cae2fd78580fdf90dae17ac6
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index 9c6bbdc4f8e4f78fd745ac4e71510d9534925a78..f4a68476f71e8283bb3da3642758416efb98c168 100644
+index e4eaba65b25262ce5ed27d78da13a260ec57f6db..ddd3be9aa7aac43140a1e664eefce7ac195ba119 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
-@@ -93,6 +93,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
+@@ -95,6 +95,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
                        const std::string& frame_name,
                        WindowOpenDisposition disposition,
                        const blink::mojom::WindowFeatures& features,
@@ -210,10 +210,10 @@ index 82e9d3dfb5f7da76d89fe15ae61d379fa46e177d..fd035512099a54dff6cc951a2226c23a
 
 }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 70d107d7c99056e790d75755855b804ed1961a90..a0ed0e7cd27532dcf2c327874ae4573c70290ecd 100644
+index de39a688207f81143c59ad54385642389b0fcc4e..93c5b79727674ff1c5344d39fd7bcd07c3101424 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2270,6 +2270,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2280,6 +2280,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
   WebWindowFeatures window_features =
       GetWindowFeaturesFromString(features, entered_window);
 
--- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch
+++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
@@ -6,7 +6,7 @@ Subject: chore: add electron deps to gitignores
 Makes things like "git status" quicker when developing electron locally

 diff --git a/.gitignore b/.gitignore
-index 375db3d02ce2837ba69e3e93c38cde7153ba079f..fc3f4f71c43facf695d326f0bc64e0ad920aa9ac 100644
+index 0a0f0118d5c1a5a2f3ad28b068bebb849eba7246..5ca6d03b709ef119ccd6482b2f305f8a3aeb7438 100644
 --- a/.gitignore
 +++ b/.gitignore
@@ -217,6 +217,7 @@ vs-chromium-project.txt
@@ -18,12 +18,12 @@ index 375db3d02ce2837ba69e3e93c38cde7153ba079f..fc3f4f71c43facf695d326f0bc64e0ad
 /googleurl
 /gpu/gles2_conform_test
 diff --git a/third_party/.gitignore b/third_party/.gitignore
-index 3e117f79191d5cea0fb4f1c6b0e95513562d7691..f197d17a55a802b01aaba602eff7c83f2a55c7b5 100644
+index ad591b3a0f2afe24d53dac76655f81790c1baa50..080d19d34659290e70f599e3d91da286013be76f 100644
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
-@@ -45,7 +45,9 @@
- /devserver
+@@ -46,7 +46,9 @@
 /directxsdk
+ /dragonbox/src
 /edk2
 +/electron_node
 /elfutils/src
@@ -31,7 +31,7 @@ index 3e117f79191d5cea0fb4f1c6b0e95513562d7691..f197d17a55a802b01aaba602eff7c83f
 /espresso/lib/
 /eyesfree/src
 /fast_float/src
-@@ -93,6 +95,7 @@
+@@ -94,6 +96,7 @@
 /mocha
 /mockito/src
 /nacl_sdk_binaries/
@@ -39,7 +39,7 @@ index 3e117f79191d5cea0fb4f1c6b0e95513562d7691..f197d17a55a802b01aaba602eff7c83f
 /ninja
 /node/*.tar.gz
 /node/linux/
-@@ -137,7 +140,7 @@
+@@ -138,7 +141,7 @@
 /spirv-cross/src
 /spirv-headers/src
 /spirv-tools/src
--- a/patches/chromium/chore_grandfather_in_electron_views_and_delegates.patch
+++ b/patches/chromium/chore_grandfather_in_electron_views_and_delegates.patch
@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Mon, 14 Apr 2025 11:34:25 -0500
+Subject: chore: "grandfather in" Electron Views and Delegates
+
+6441736: Block further usage of WidgetDelegateView. | https://chromium-review.googlesource.com/c/chromium/src/+/6441736
+
+6442265: Add a PassKey for std::make_unique<WidgetDelegateView>(). | https://chromium-review.googlesource.com/c/chromium/src/+/6442265
+
+6448510: Lock further access to View::set_owned_by_client(). | https://chromium-review.googlesource.com/c/chromium/src/+/6448510
+
+diff --git a/ui/views/view.h b/ui/views/view.h
+index ae7eab37f12ba80ec423d229cf048021e9ba6765..507a75dc7947295db221b01356fa57baf3cf03e4 100644
+--- a/ui/views/view.h
+++ b/ui/views/view.h
+@@ -82,6 +82,19 @@ class ArcNotificationContentView;
+ class WideFrameView;
+ }  // namespace ash
+ 
+namespace electron {
+class DevToolsWindowDelegate;
+class InspectableWebContentsView;
+class MenuBar;
+class RootView;
+class RootViewMac;
+}
+
+namespace electron::api {
+class ImageView;
+class View;
+}
+
+ namespace exo {
+ class ShellSurfaceBase;
+ }
+@@ -324,6 +337,14 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+  public:
+   class OwnedByClientPassKey {
+    private:
+    // TODO(ckerr) can this list be shortened?
+    friend class electron::DevToolsWindowDelegate;
+    friend class electron::InspectableWebContentsView;
+    friend class electron::MenuBar;
+    friend class electron::RootView;
+    friend class electron::RootViewMac;
+    friend class electron::api::ImageView;
+    friend class electron::api::View;
+     // DO NOT ADD TO THIS LIST!
+     // These existing cases are "grandfathered in", but there shouldn't be more.
+     // See comments atop class.
+diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
+index 89de188e6a0139a236a824b189f1048613d6f457..c438376c34cac4ec7ac7a03d852685c18b10068e 100644
+--- a/ui/views/widget/widget_delegate.h
+++ b/ui/views/widget/widget_delegate.h
+@@ -165,6 +165,12 @@ namespace crostini {
+ class AppRestartDialog;
+ }
+ 
+namespace electron {
+class AutofillPopupView;
+class DevToolsWindowDelegate;
+class NativeWindowMac;
+}
+
+ namespace enterprise_connectors {
+ class ContentAnalysisDialog;
+ class ContentAnalysisDialogBehaviorBrowserTest;
+@@ -367,6 +373,7 @@ class VIEWS_EXPORT WidgetDelegate {
+ 
+   class OwnedByWidgetPassKey {
+    private:
+    friend class electron::DevToolsWindowDelegate;
+     // DO NOT ADD TO THIS LIST!
+     // These existing cases are "grandfathered in", but there shouldn't be more.
+     // See comments atop `SetOwnedByWidget()`.
+@@ -463,6 +470,7 @@ class VIEWS_EXPORT WidgetDelegate {
+   };
+   class RegisterDeleteCallbackPassKey {
+    private:
+    friend class electron::NativeWindowMac;
+     // DO NOT ADD TO THIS LIST!
+     // These existing cases are "grandfathered in", but there shouldn't be more.
+     // See comments atop `RegisterDeleteDelegateCallback()`.
+@@ -913,6 +921,7 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
+   View* GetContentsView() override;
+ 
+  private:
+  friend class electron::AutofillPopupView;
+   // DO NOT ADD TO THIS LIST!
+   // These existing cases are "grandfathered in", but there shouldn't be more.
+   // See comments atop class.
--- a/patches/chromium/chore_introduce_blocking_api_for_electron.patch
+++ b/patches/chromium/chore_introduce_blocking_api_for_electron.patch
@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
 of explicitly adding ScopedAllowBlocking calls as friends.

 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 075e8173bcf1cfe420b87afe216bb06459a0d8bc..a300ed1e8c226f43fbfe6d82f72f9fb741fa342e 100644
+index b1abcfaab58df4555d3a26481915d64ef5458e17..f2f43454c1c124da9983998564837ebf3589aefd 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
@@ -132,6 +132,7 @@ class KeyStorageLinux;
@@ -28,7 +28,7 @@ index 075e8173bcf1cfe420b87afe216bb06459a0d8bc..a300ed1e8c226f43fbfe6d82f72f9fb7
 namespace enterprise_connectors {
 class LinuxKeyRotationCommand;
 }  // namespace enterprise_connectors
-@@ -574,6 +578,7 @@ class BASE_EXPORT ScopedAllowBlocking {
+@@ -577,6 +581,7 @@ class BASE_EXPORT ScopedAllowBlocking {
   friend class ::DesktopNotificationBalloon;
   friend class ::FirefoxProfileLock;
   friend class ::GaiaConfig;
@@ -36,10 +36,10 @@ index 075e8173bcf1cfe420b87afe216bb06459a0d8bc..a300ed1e8c226f43fbfe6d82f72f9fb7
   friend class ::ProfileImpl;
   friend class ::ScopedAllowBlockingForProfile;
   friend class ::StartupTabProviderImpl;
-@@ -613,6 +618,7 @@ class BASE_EXPORT ScopedAllowBlocking {
+@@ -615,6 +620,7 @@ class BASE_EXPORT ScopedAllowBlocking {
+   friend class cronet::CronetPrefsManager;
   friend class crypto::ScopedAllowBlockingForNSS;  // http://crbug.com/59847
   friend class drive::FakeDriveService;
-   friend class extensions::DesktopAndroidExtensionSystem;
 +  friend class electron::ScopedAllowBlockingForElectron;
   friend class extensions::InstalledLoader;
   friend class extensions::UnpackedInstaller;
--- a/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch
+++ b/patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch
@@ -34,10 +34,10 @@ index 39b5a8fdd165efd74b00256552b51b5413107958..bfc4ef4f50efff4a77f2aef64335bb7e
 
 class ScrollEvent;
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 55c426aee12da4d4d1f62dc7d489133e8d21dc49..40c88bf14d2d4fe841e29b32414361688ae438e5 100644
+index 61509e2eb982797845098abf5f36e031be63686b..24283be8d1660acce0a5ae89386b8eef9989fc12 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -1362,6 +1362,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged(
+@@ -1415,6 +1415,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged(
   window()->SetProperty(aura::client::kHeadlessBoundsKey, bounds);
 }
 
@@ -49,22 +49,22 @@ index 55c426aee12da4d4d1f62dc7d489133e8d21dc49..40c88bf14d2d4fe841e29b3241436168
 DesktopWindowTreeHostWin::GetSingletonDesktopNativeCursorManager() {
   return new DesktopNativeCursorManagerWin();
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 4865d79c95c34d8cead96d3bb8063a0e2bd6076b..ebfa09ed15dca98b75a013e3dcbb566ce84d7cb7 100644
+index dab595aacaeca4f6f735fd04004c27a4949278d2..177134d439866db9dbbde657ff358a761ad7f39d 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-@@ -267,6 +267,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin : public DesktopWindowTreeHost,
+@@ -272,6 +272,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
   void HandleWindowSizeUnchanged() override;
   void HandleWindowScaleFactorChanged(float window_scale_factor) override;
   void HandleHeadlessWindowBoundsChanged(const gfx::Rect& bounds) override;
 +  bool HandleMouseEventForCaption(UINT message) const override;
 
-   // Overridden from WidgetObserver.
-   void OnWidgetThemeChanged(Widget* widget) override;
+   Widget* GetWidget();
+   const Widget* GetWidget() const;
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 3a60e310d1c4048f0e37e085c97b8dfc093aefda..8fe48c9bef144218e34434d563883b15733d03bc 100644
+index 5919efa661c3b1ed210f7a67f85fdd3882011bae..5b17d5bf0b32405ae9515b941a17b68a04a3b317 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3156,15 +3156,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3178,15 +3178,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
     }
     // We must let Windows handle the caption buttons if it's drawing them, or
     // they won't work.
@@ -86,7 +86,7 @@ index 3a60e310d1c4048f0e37e085c97b8dfc093aefda..8fe48c9bef144218e34434d563883b15
       return 0;
     }
   }
-@@ -3187,6 +3191,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3209,6 +3213,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
     // handle alt-space, or in the frame itself.
     is_right_mouse_pressed_on_caption_ = false;
     ReleaseCapture();
@@ -94,7 +94,7 @@ index 3a60e310d1c4048f0e37e085c97b8dfc093aefda..8fe48c9bef144218e34434d563883b15
     // |point| is in window coordinates, but WM_NCHITTEST and TrackPopupMenu()
     // expect screen coordinates.
     POINT screen_point = CR_POINT_INITIALIZER_FROM_LPARAM(l_param);
-@@ -3194,7 +3199,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3216,7 +3221,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
     w_param = static_cast<WPARAM>(SendMessage(
         hwnd(), WM_NCHITTEST, 0, MAKELPARAM(screen_point.x, screen_point.y)));
     if (w_param == HTCAPTION || w_param == HTSYSMENU) {
@@ -114,7 +114,7 @@ index 3a60e310d1c4048f0e37e085c97b8dfc093aefda..8fe48c9bef144218e34434d563883b15
     }
   } else if (message == WM_NCLBUTTONDOWN &&
 diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
-index de8fd5657e6885f74a5970bdd49647a6f1616387..4af87792edc7a147468077b834582510550e35e6 100644
+index 252d7ce78ad49596fb030160cb69d9bf3dc0951f..5e7975cf5cb3435b844fda58d7582d54cb583a72 100644
 --- a/ui/views/win/hwnd_message_handler_delegate.h
 +++ b/ui/views/win/hwnd_message_handler_delegate.h
@@ -255,6 +255,10 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
--- a/patches/chromium/chore_partial_revert_of.patch
+++ b/patches/chromium/chore_partial_revert_of.patch
@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
 by changing something in Electron.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6010d9f9fc9bfeffb3e5a64de7352b52a202cbf7..4325cdfd256ae7a1008e073d42da995b82df5bba 100644
+index e3085847de7875afa655b3cfa4aa39892be626eb..46fc6d6683c50fb8a340680de2eda340f5be4cca 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4980,7 +4980,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5058,7 +5058,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
           : IsGuest();
   // While some guest types do not have a guest SiteInstance, the ones that
   // don't all override WebContents creation above.
--- a/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch
+++ b/patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch
@@ -14,10 +14,10 @@ This change patches it out to prevent the DCHECK.
 It can be removed once/if we see a better solution to the problem.

 diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
-index adaa1cd426c138972b088d0d0093b0e1653af231..be4684c94ba2214255c5dbe9cdcf1ea316c60c06 100644
+index 4007e92316a6ac59145fa9bc021904fd1b3b0136..afedeaea7fd419f3374ffeebb7ee931219a90f93 100644
 --- a/content/browser/site_instance_impl.cc
 +++ b/content/browser/site_instance_impl.cc
-@@ -229,7 +229,7 @@ scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::CreateForGuest(
+@@ -226,7 +226,7 @@ scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::CreateForGuest(
     BrowserContext* browser_context,
     const StoragePartitionConfig& partition_config) {
   DCHECK(browser_context);
--- a/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
+++ b/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
@@ -9,7 +9,7 @@ Electron does not support Profiles, so this Profile::FromBrowserContext()
 call is not needed and will not link. This change patches it out.

 diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
-index 9774ed3e55c0d78f21bb0cb0b2607cc07eaf78e0..f58c3946130fa469f2775d8bae773e5bbfc71a96 100644
+index e3b9f14a4cf2167064ce6716053e663adffa1542..65f13a4607c8145858fd47d81cb9960c44272d79 100644
 --- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
 +++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
@@ -45,6 +45,7 @@ namespace {
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -80,10 +80,10 @@ index 4fd8dff1089cd6afa6a66dc185734d7671657281..0a1f4268ea771a3d5d4a2668928c6e5d
       content::WebContents* source,
       const content::OpenURLParams& params,
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 8232c0081baaeb3df9f2f6224f8fe31a2dcb1d5b..081c01bc00dfdef66c23a9ef640ed159f4f7557b 100644
+index de3f9f56b47628e1104b5f64b3c17cc35e10bfc7..3a19c28386fd3a0b8755a06510895c685f2c0cdb 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -2264,12 +2264,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -2327,12 +2327,11 @@ bool Browser::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -99,10 +99,10 @@ index 8232c0081baaeb3df9f2f6224f8fe31a2dcb1d5b..081c01bc00dfdef66c23a9ef640ed159
 
 WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 7a61c64db93db7f3b31b8d39897257a6315383c2..7db684020fbaf7061ed61a8b1cefba8c757f2fe5 100644
+index 0bcb2fc072e47c2c259b724209b4814486329fe1..db674988cf87f198ed1af7e0f4def24776fbaa89 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -981,8 +981,7 @@ class Browser : public TabStripModelObserver,
+@@ -1027,8 +1027,7 @@ class Browser : public TabStripModelObserver,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
   content::WebContents* AddNewContents(
       content::WebContents* source,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 952fd20f71560acd89c74f08e9d8cdbf34fb5a1a..59b05937ceb1b81b69d913f587150021b9031106 100644
+index 94b4429fffb474304c1d43d1cf1337fde90d9e45..2a683ac9a810d7bc7286e56ce50dd51adfc4f25f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4943,8 +4943,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5021,8 +5021,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   // TODO(crbug.com/40202416): Support a way for MPArch guests to support this.
   if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                        source_site_instance, params.window_container_type,
@@ -232,7 +232,7 @@ index 952fd20f71560acd89c74f08e9d8cdbf34fb5a1a..59b05937ceb1b81b69d913f587150021
         static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
             opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index f688e6d1e6c11f0dd80f498e6361fa822e8c2eb8..dc47ebfd61f16901b7f8e0e4c30c79eaf5d0710e 100644
+index 97a3ea6f292563a41fd41f812ac72526a96d8471..b299dd5659100d317a3574e902bf2c29c5defd2c 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -159,8 +159,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -246,10 +246,10 @@ index f688e6d1e6c11f0dd80f498e6361fa822e8c2eb8..dc47ebfd61f16901b7f8e0e4c30c79ea
 }
 
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 96cb58b1a88499cf8f78d748dc5a1cc1c6b6a128..8ff56b56da764c8af14c40babc529ee4cb089c7e 100644
+index 8a18958035cc1dd26be558349f64f7727570c4ba..7d9c9b06bcc57ef5eb0a2ca74ee20632a1393f9e 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
-@@ -354,8 +354,7 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -355,8 +355,7 @@ class CONTENT_EXPORT WebContentsDelegate {
       SiteInstance* source_site_instance,
       mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@@ -260,7 +260,7 @@ index 96cb58b1a88499cf8f78d748dc5a1cc1c6b6a128..8ff56b56da764c8af14c40babc529ee4
   // Allow delegate to creates a custom WebContents when
   // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
-index f8b00fec3f2786822b22c052051c524f766c059d..85a535d0b1e49619fec8c9f5c67896204c9fb164 100644
+index 8d6fc67cb9b1d653bce64d1ba22aa7ec2d79257c..d5ce746373a1a4310e1eb530aee011a785e1d68c 100644
 --- a/extensions/browser/guest_view/app_view/app_view_guest.cc
 +++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
@@ -153,8 +153,7 @@ bool AppViewGuest::IsWebContentsCreationOverridden(
@@ -274,7 +274,7 @@ index f8b00fec3f2786822b22c052051c524f766c059d..85a535d0b1e49619fec8c9f5c6789620
 
   return true;
 diff --git a/extensions/browser/guest_view/app_view/app_view_guest.h b/extensions/browser/guest_view/app_view/app_view_guest.h
-index 136448c9df06b9704e95d2797a60907d7ec5170a..21cc7b08dd8f9e4a32d29dd35c42ec2ce9f6cd53 100644
+index 775cfbf5adac0017f343bc091daee1b8883c75bb..dc97e5d60d3663ef7f7c78c28603f9e1c5aea4ff 100644
 --- a/extensions/browser/guest_view/app_view/app_view_guest.h
 +++ b/extensions/browser/guest_view/app_view/app_view_guest.h
@@ -10,6 +10,7 @@
@@ -324,7 +324,7 @@ index e39031afd8fff7cb6e278555cc58a48d86407d65..f67f6a5603c1fa9e66ccdde9b601df9a
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 16babdc7affdaef1af24850cf35494b8b4fe1479..1e77b091d94457c892788f7a441a83e7a96a49cc 100644
+index 60de0d74ee40fedcbae96e5049e21dc238bf33bf..c568d4d08f772e1d381820bed826a0b64a631449 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -452,8 +452,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -352,10 +352,10 @@ index 2dcf51f335f5dac39f431c3e0f56f8789f33d40b..2b433624d0604e0b9da5117b9e83cc15
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
-index 635050eedc20fb89608677bcebeb5f8187bd4b59..1220f377169f8209db39654b7ddbf1da52c017b7 100644
+index c10903a8e7e5fb66a1b038eab9015658a93672df..5a3afdb8ababf6e465c6166ca6229af7b4d6941d 100644
 --- a/fuchsia_web/webengine/browser/frame_impl.cc
 +++ b/fuchsia_web/webengine/browser/frame_impl.cc
-@@ -575,8 +575,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -576,8 +576,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -380,7 +380,7 @@ index 1012a909ef1fcae51c218ae519fe7e0db65ab087..127b1ae940bc9313aecb635e2b01bb6f
                           int opener_render_process_id,
                           int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 62be493c74423875af45a92c98b2ffceb928189f..ec82d8e47bf0a33f832b8ca242f395fe59a1bbee 100644
+index 7ca1e83ba1fd2dc5ea7c7ce644c3b7c54b9999f9..c1639653714d6973bcb5a0b37cb7028db8406742 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
@@ -206,8 +206,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
@@ -394,10 +394,10 @@ index 62be493c74423875af45a92c98b2ffceb928189f..ec82d8e47bf0a33f832b8ca242f395fe
         ->options()
         ->block_new_web_contents();
 diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
-index bf432db4ca8463f2451dc09d5ca484da1235634f..e144be74ce2d34f50d26d08d5bf206f7aa64c5d3 100644
+index 250e7f524a9ab1cc6fda2bfefb3c78a8e971b625..55a0db02885a85e538d267402cfd0ac8ce52b921 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
-@@ -487,8 +487,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
+@@ -489,8 +489,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
--- a/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch
+++ b/patches/chromium/chore_remove_check_is_test_on_script_injection_tracker.patch
@@ -9,14 +9,15 @@ Electron when a session is non persistent we do not initialize the
 ExtensionSystem, so this check is not relevant for Electron.

 diff --git a/extensions/browser/script_injection_tracker.cc b/extensions/browser/script_injection_tracker.cc
-index 8f590b9ebd02969f0c5d9f617852954a69f51afd..91c4a61525173d2cd95a8c2c626c1be5a84b003f 100644
+index 172f02dbe9bb22425f8d45119b6d8466c949ba36..063015e14053f75544e6700c9251d6ecae95389c 100644
 --- a/extensions/browser/script_injection_tracker.cc
 +++ b/extensions/browser/script_injection_tracker.cc
-@@ -176,7 +176,6 @@ std::vector<const UserScript*> GetLoadedDynamicScripts(
-   UserScriptManager* manager =
-       ExtensionSystem::Get(process.GetBrowserContext())->user_script_manager();
+@@ -178,7 +178,7 @@ std::vector<const UserScript*> GetLoadedDynamicScripts(
   if (!manager) {
-    CHECK_IS_TEST();
+     // TODO(crbug.com/412829476): Remove this guard once we enable
+     // UserScriptManager on desktop Android.
+-#if BUILDFLAG(ENABLE_EXTENSIONS)
+#if 0
+     CHECK_IS_TEST();
+ #endif
     return std::vector<const UserScript*>();
-   }
- 
--- a/patches/chromium/chore_remove_conflicting_allow_unsafe_libc_calls.patch
+++ b/patches/chromium/chore_remove_conflicting_allow_unsafe_libc_calls.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Charles Kerr <charles@charleskerr.com>
-Date: Sat, 22 Feb 2025 13:15:39 -0600
-Subject: chore: remove conflicting allow_unsafe_libc_calls
-
-We want builds to fail if a buffer warning comes from Electron code but
-not from code that we don't maintain (e.g. upstream Chromium code), so
-//electron/electron_unsafe_buffer_paths.txt turns off Chromium warnings.
-
-There are some upstream files that generate warnings *and* also have
-pragmas that override //electron/electron_unsafe_buffer_paths.txt,
-forcing them to be tested. This breaks our build.
-
-Files can be removed from this patch when upstream either removes the
-pragma or fixes the other warnings. This patch can be removed when no
-files are left.
-
-diff --git a/net/cookies/parsed_cookie.cc b/net/cookies/parsed_cookie.cc
-index 7d5d0106a3675b3fa21b0e00a755f5c0ed11c87b..d26c645d70b54b31815c8140954ee6d0a34fa8af 100644
--- a/net/cookies/parsed_cookie.cc
-+++ b/net/cookies/parsed_cookie.cc
-@@ -2,11 +2,6 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-#ifdef UNSAFE_BUFFERS_BUILD
-// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
-#pragma allow_unsafe_libc_calls
-#endif
-
- // Portions of this code based on Mozilla:
- //   (netwerk/cookie/src/nsCookieService.cpp)
- /* ***** BEGIN LICENSE BLOCK *****
-diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
-index 2235a264ff87ef400734a7308c2735886c63c92c..2310a951c5b4d34447a39c7585bdf1027a9953cc 100644
--- a/net/http/http_response_headers.cc
-+++ b/net/http/http_response_headers.cc
-@@ -2,11 +2,6 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-#ifdef UNSAFE_BUFFERS_BUILD
-// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
-#pragma allow_unsafe_libc_calls
-#endif
-
- // The rules for header parsing were borrowed from Firefox:
- // http://lxr.mozilla.org/seamonkey/source/netwerk/protocol/http/src/nsHttpResponseHead.cpp
- // The rules for parsing content-types were also borrowed from Firefox:
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -39,10 +39,10 @@ index e87c180342b967756efeb701c73207fcee8754f1..42e37564e585987d367921568f0f1d2b
           NOTREACHED();
       }
 diff --git a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
-index c98ecc36007185052481b6479b2ba4608e326021..dd0e4553b78997beea0f11242eeb9f759359066f 100644
+index b6985bd63a34c55154fcfae601add6ce6c451704..fb44cc65b1a15c8b69410a2a2cb925a0326bb438 100644
 --- a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
 +++ b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
-@@ -111,7 +111,8 @@ bool GlobalAcceleratorListenerOzone::StartListeningForAccelerator(
+@@ -147,7 +147,8 @@ bool GlobalAcceleratorListenerOzone::StartListeningForAccelerator(
   const bool registered =
       platform_global_shortcut_listener_->RegisterAccelerator(
           accelerator.key_code(), accelerator.IsAltDown(),
@@ -52,7 +52,7 @@ index c98ecc36007185052481b6479b2ba4608e326021..dd0e4553b78997beea0f11242eeb9f75
   if (registered) {
     registered_hot_keys_.insert(accelerator);
   }
-@@ -126,14 +127,15 @@ void GlobalAcceleratorListenerOzone::StopListeningForAccelerator(
+@@ -162,14 +163,15 @@ void GlobalAcceleratorListenerOzone::StopListeningForAccelerator(
 
   platform_global_shortcut_listener_->UnregisterAccelerator(
       accelerator.key_code(), accelerator.IsAltDown(), accelerator.IsCtrlDown(),
@@ -70,7 +70,7 @@ index c98ecc36007185052481b6479b2ba4608e326021..dd0e4553b78997beea0f11242eeb9f75
   int modifiers = 0;
   if (is_alt_down) {
     modifiers |= ui::EF_ALT_DOWN;
-@@ -144,6 +146,9 @@ void GlobalAcceleratorListenerOzone::OnKeyPressed(ui::KeyboardCode key_code,
+@@ -180,6 +182,9 @@ void GlobalAcceleratorListenerOzone::OnKeyPressed(ui::KeyboardCode key_code,
   if (is_shift_down) {
     modifiers |= ui::EF_SHIFT_DOWN;
   }
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -116,10 +116,10 @@ index 42fe73aefe44f218d6a5e8cb1550ff48859c4b70..a1235f0c7ad44ae9c9fdc805af5b9dc5
         arguments.push_back("--monitor-self");
       }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index 0e00d26f79231a01e88981b30ff950e427cd31f4..70f014c75031f9529501e102f97e0e1adadb8ffb 100644
+index 5b811cbbc51544cbff7c2e99c3a7ced824990002..f2376d74fbd2c8196184035fc0fb24a0a8ebfe0e 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
-@@ -92,6 +92,7 @@ bool PlatformCrashpadInitialization(
+@@ -93,6 +93,7 @@ bool PlatformCrashpadInitialization(
 
     std::map<std::string, std::string> process_annotations;
     GetPlatformCrashpadAnnotations(&process_annotations);
@@ -127,7 +127,7 @@ index 0e00d26f79231a01e88981b30ff950e427cd31f4..70f014c75031f9529501e102f97e0e1a
 
     std::string url = crash_reporter_client->GetUploadUrl();
 
-@@ -129,6 +130,13 @@ bool PlatformCrashpadInitialization(
+@@ -133,6 +134,13 @@ bool PlatformCrashpadInitialization(
 
     std::vector<std::string> arguments(start_arguments);
 
--- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
+++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
@@ -7,10 +7,10 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
 to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.

 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 054f38d683280638c7ac618d2ff8f7aef1a0def0..6e9d8d9a043cf8b67e26f70b3a904abcfc3c1a61 100644
+index d55c408557e15650897c9ed6d5b6bd83178a551f..f1c54919990af204004380b0d84ee750de5e3c35 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -271,8 +271,13 @@ void AsanProcessInfoCB(const char*, bool*) {
+@@ -275,8 +275,13 @@ void AsanProcessInfoCB(const char*, bool*) {
 }
 #endif  // defined(ADDRESS_SANITIZER)
 
@@ -25,7 +25,7 @@ index 054f38d683280638c7ac618d2ff8f7aef1a0def0..6e9d8d9a043cf8b67e26f70b3a904abc
 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
   base::FileDescriptorStore& file_descriptor_store =
       base::FileDescriptorStore::GetInstance();
-@@ -301,11 +306,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
+@@ -305,11 +310,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
 
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 
@@ -40,7 +40,7 @@ index 054f38d683280638c7ac618d2ff8f7aef1a0def0..6e9d8d9a043cf8b67e26f70b3a904abc
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 }
 
-@@ -978,7 +984,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
+@@ -1005,7 +1011,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
     return TerminateForFatalInitializationError();
 #endif  // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
 
@@ -50,19 +50,18 @@ index 054f38d683280638c7ac618d2ff8f7aef1a0def0..6e9d8d9a043cf8b67e26f70b3a904abc
   blink::TrialTokenValidator::SetOriginTrialPolicyGetter(
       base::BindRepeating([]() -> blink::OriginTrialPolicy* {
 diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
-index 8194fc8b036482eedb162ff92bb82165cdf3c8d0..f038620516d7783170bc82b3b14dde4e01f3975d 100644
+index 8b02f553e2fc29da88c3e14c05a7ee82210eab51..14f2e66d5ecda6e860724a3ab946eaaffba33d6d 100644
 --- a/content/public/app/content_main_delegate.cc
 +++ b/content/public/app/content_main_delegate.cc
-@@ -4,6 +4,8 @@
- 
+@@ -5,6 +5,7 @@
 #include "content/public/app/content_main_delegate.h"
 
+ #include <variant>
 +#include <string_view>
-+
+ 
 #include "base/check.h"
 #include "base/notreached.h"
- #include "build/build_config.h"
-@@ -72,6 +74,10 @@ std::optional<int> ContentMainDelegate::PostEarlyInitialization(
+@@ -74,6 +75,10 @@ std::optional<int> ContentMainDelegate::PostEarlyInitialization(
   return std::nullopt;
 }
 
@@ -74,13 +73,13 @@ index 8194fc8b036482eedb162ff92bb82165cdf3c8d0..f038620516d7783170bc82b3b14dde4e
   return new ContentClient();
 }
 diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
-index 801bfd401ea4a8e72417d88efaa718cc6fb60883..663fec68d0c2855cdf83bb259b85c22910a67464 100644
+index db611d99a6c0f18f39967b38791822fda7d175b5..cc150475de655d5ef20a107ae3ef80c08af8c7fb 100644
 --- a/content/public/app/content_main_delegate.h
 +++ b/content/public/app/content_main_delegate.h
-@@ -8,6 +8,7 @@
- #include <memory>
+@@ -9,6 +9,7 @@
 #include <optional>
 #include <string>
+ #include <variant>
 +#include <string_view>
 #include <vector>
 
@@ -95,10 +94,10 @@ index 801bfd401ea4a8e72417d88efaa718cc6fb60883..663fec68d0c2855cdf83bb259b85c229
   friend class ContentClientCreator;
   friend class ContentClientInitializer;
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 578e200a88d89b356e991b3317ff1e71f25ff75e..ae49b7b5e830a7127812219df1c8888b7ba4b348 100644
+index 11cafc3e1588cce52b76cc2f09f66b3e451fb087..e07bdaeccecc8015462e35d5cf4606335e2e962c 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -672,8 +672,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
+@@ -660,8 +660,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
 
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
 
@@ -108,7 +107,7 @@ index 578e200a88d89b356e991b3317ff1e71f25ff75e..ae49b7b5e830a7127812219df1c8888b
   if (g_mapped_snapshot) {
     // TODO(crbug.com/40558459): Confirm not loading different type of snapshot
     // files in a process.
-@@ -682,10 +681,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
+@@ -670,10 +669,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
 
   base::MemoryMappedFile::Region file_region;
   base::File file =
--- a/patches/chromium/custom_protocols_plzserviceworker.patch
+++ b/patches/chromium/custom_protocols_plzserviceworker.patch
@@ -8,10 +8,10 @@ Allow registering custom protocols to handle service worker main script fetching
 Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511

 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
-index ff25eb3670d2391c6fb41b7c612c30ee8798983f..116763b520713a5c61462b2e048a7358486831a2 100644
+index b4c984e0dd22f148a426ce0ea04988798ed95aaa..5fd099b6396fc51d29fce2843531d5fc89642d35 100644
 --- a/content/browser/service_worker/service_worker_context_wrapper.cc
 +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1969,6 +1969,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1961,6 +1961,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
       loader_factory_bundle_info =
           context()->loader_factory_bundle_for_update_check()->Clone();
 
@@ -38,7 +38,7 @@ index ff25eb3670d2391c6fb41b7c612c30ee8798983f..116763b520713a5c61462b2e048a7358
   if (auto* config = content::WebUIConfigMap::GetInstance().GetConfig(
           browser_context(), scope)) {
     // If this is a Service Worker for a WebUI, the WebUI's URLDataSource
-@@ -1988,9 +2008,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1980,9 +2000,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
             features::kEnableServiceWorkersForChromeScheme) &&
         scope.scheme_piece() == kChromeUIScheme) {
       config->RegisterURLDataSource(browser_context());
@@ -49,7 +49,7 @@ index ff25eb3670d2391c6fb41b7c612c30ee8798983f..116763b520713a5c61462b2e048a7358
           .emplace(kChromeUIScheme, CreateWebUIServiceWorkerLoaderFactory(
                                         browser_context(), kChromeUIScheme,
                                         base::flat_set<std::string>()));
-@@ -1998,9 +2016,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1990,9 +2008,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
                    features::kEnableServiceWorkersForChromeUntrusted) &&
                scope.scheme_piece() == kChromeUIUntrustedScheme) {
       config->RegisterURLDataSource(browser_context());
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.

 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 71db145609652dbbe733dbc96d2630b686f6c8c9..6aa0fd5422ee0057acc3e5c423ca2847a4ebb17e 100644
+index 88a6090a49da6071fded348a901c7c62b647b503..cf6f80bd3c9af0be5065e75e09a1b4150aeab0c8 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -560,7 +560,11 @@
--- a/patches/chromium/disable_freezing_flags_after_init_in_node.patch
+++ b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
@@ -15,10 +15,10 @@ at some point be an API to "unfreeze" the flags, or we may be able to refactor
 node initialization to not update flags after V8 initialization.

 diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
-index eb11068e932b7b94cbf215d6f84ae427ce77fcd5..9744e45974af215bfbe9e5feb2db7274f8efebf0 100644
+index 7a20f5199bd6cb5d13f31ec5db3e3cc03821bc3a..22167f808cb7b27d5b2a8e517cdeee63205ab9ad 100644
 --- a/content/renderer/render_process_impl.cc
 +++ b/content/renderer/render_process_impl.cc
-@@ -208,6 +208,9 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -212,6 +212,9 @@ RenderProcessImpl::RenderProcessImpl()
     v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
   }
 
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 22ffafd8f5e0f49d5c9df7ecd3f61dad3dfd2814..a409c64768968c81be3b6c7e7646f8df26e2afe6 100644
+index 00583269d16f4b8eacb4875b12a3e69155839d12..23d5baa267333e18551d449317f3e3a6520f34a6 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -832,6 +832,10 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -834,6 +834,10 @@ void RenderWidgetHostImpl::WasHidden() {
     return;
   }
 
@@ -21,7 +21,7 @@ index 22ffafd8f5e0f49d5c9df7ecd3f61dad3dfd2814..a409c64768968c81be3b6c7e7646f8df
   // Prompts should remain open and functional across tab switches.
   if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) {
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index c201cff9e5c3b286389a5eb74e1a9ebd86edfef9..949f6a7867758e35c24897add9a4d47a641357b2 100644
+index 86a80795fb931f569b21c3138697b90d8b38d750..6268d7e3a64bac17b94f0bfb8e24c44a61cf7d3f 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -1012,6 +1012,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -35,7 +35,7 @@ index c201cff9e5c3b286389a5eb74e1a9ebd86edfef9..949f6a7867758e35c24897add9a4d47a
   // |routing_id| must not be MSG_ROUTING_NONE.
   // If this object outlives |delegate|, DetachDelegate() must be called when
 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 70f368ab0c59e7f495cb13094160d72f601e0938..19d2df47b0c929558ac8cfc208742dfef463a68b 100644
+index 5867fc3e77326991f30d835d08d3cfafe2b6687c..d719b546b8c3c59003698b26dead065da7d76341 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -643,7 +643,7 @@ void RenderWidgetHostViewAura::HideImpl() {
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.

 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index d05708d42a0dc1aea4faad3be19f558c93e93265..13dda0bf6560ca03c4c88e787cc4165dfe745b26 100644
+index d976c082529a62bcef7352531ced808e5970027e..31e95005359f6e8e4e18ebd75324940f4fdd11eb 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1464,6 +1464,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1476,6 +1476,7 @@ void Navigator::RecordNavigationMetrics(
             .InMilliseconds());
   }
 
@@ -35,7 +35,7 @@ index d05708d42a0dc1aea4faad3be19f558c93e93265..13dda0bf6560ca03c4c88e787cc4165d
   // If this is a same-process navigation and we have timestamps for unload
   // durations, fill those metrics out as well.
   if (params.unload_start && params.unload_end &&
-@@ -1513,6 +1514,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1525,6 +1526,7 @@ void Navigator::RecordNavigationMetrics(
          first_before_unload_start_time)
             .InMilliseconds());
   }
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.

 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 24f63e82a1a170b392bdc8e868729ddd5f9238fa..55c426aee12da4d4d1f62dc7d489133e8d21dc49 100644
+index 6ad16425f2fb3438be178cb06a85ef72f8d09e22..61509e2eb982797845098abf5f36e031be63686b 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -637,7 +637,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
+@@ -664,7 +664,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
 void DesktopWindowTreeHostWin::SetAspectRatio(
     const gfx::SizeF& aspect_ratio,
     const gfx::Size& excluded_margin) {
@@ -19,10 +19,10 @@ index 24f63e82a1a170b392bdc8e868729ddd5f9238fa..55c426aee12da4d4d1f62dc7d489133e
                                    excluded_margin);
 }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 8d5002fab43ccfcaccdb044fc9b2a95748e71b75..adade58a533c373087d8c51a5744e8f118ba6e9d 100644
+index ac502dee8a21725db9de2e232cb5092a0670f1d9..db2b841e973f05049f712c732ae8d4815a8aff7a 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -997,8 +997,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
+@@ -992,8 +992,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
 
 void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
                                         const gfx::Size& excluded_margin) {
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -9,7 +9,7 @@ correctly tagged with MAP_JIT we need to use gins page allocator instead
 of the default V8 allocator.  This probably can't be usptreamed.

 diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h
-index c34f34146d0aab681318b64ac33081bdc21ce7d6..11cdf6c34d8f79fcf293f59785e586dc8363b983 100644
+index 9dac402705385087ced2df2db757a07246984a94..cb49b4f085026658e920699ed285d524119d6aad 100644
 --- a/gin/public/v8_platform.h
 +++ b/gin/public/v8_platform.h
@@ -32,6 +32,7 @@ class GIN_EXPORT V8Platform : public v8::Platform {
@@ -21,10 +21,10 @@ index c34f34146d0aab681318b64ac33081bdc21ce7d6..11cdf6c34d8f79fcf293f59785e586dc
   ThreadIsolatedAllocator* GetThreadIsolatedAllocator() override;
 #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index fa799a4cc32950ce03c154bc7791341d96a17f67..b8ec81b79b6129a7e26a2ffecf535fdedea8ed6c 100644
+index 698b29e9c31a2695cac30bf85c97a216ff8a6257..dbc38d0d87803496ce122da62e639f2a0334e0f6 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -204,6 +204,10 @@ ThreadIsolatedAllocator* V8Platform::GetThreadIsolatedAllocator() {
+@@ -205,6 +205,10 @@ ThreadIsolatedAllocator* V8Platform::GetThreadIsolatedAllocator() {
 }
 #endif  // PA_BUILDFLAG(ENABLE_THREAD_ISOLATION)
 
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
 
 }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index b1df0a09a9bfd226ffe7b37144e6599b099e619e..f8c7bc591552fea25b4a8e0edd7a3823b00e6b06 100644
+index 7d65c373ac4f1f538085a44ca0b11ddce89b1e62..8d3a7ca4c955a0e5004e3e2a8435591cfbfe2f16 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1814,6 +1814,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1838,6 +1838,13 @@ void NetworkContext::SetNetworkConditions(
                                       std::move(network_conditions));
 }
 
@@ -51,10 +51,10 @@ index b1df0a09a9bfd226ffe7b37144e6599b099e619e..f8c7bc591552fea25b4a8e0edd7a3823
   // This may only be called on NetworkContexts created with the constructor
   // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 930e0bd987c48d111b2c8d71147c09e4418bda6c..9373a53c5cac879c689fcea77f1dbbb32cf35b9e 100644
+index 5b5d8eccb9c84965e996cd8d2a8c7d962df7852a..66da9008486d58ad4835b3ba58a6b0aefb53ab2f 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -323,6 +323,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -326,6 +326,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
   void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
   void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                             mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 930e0bd987c48d111b2c8d71147c09e4418bda6c..9373a53c5cac879c689fcea77f1dbbb3
   void SetEnableReferrers(bool enable_referrers) override;
 #if BUILDFLAG(IS_CT_SUPPORTED)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index cf4d2dcf86b6536c37d46875f74517e478b34928..b19976926137cae56094ec6e292a5014c2fd546b 100644
+index f510b5c5c79161f32a08219aa7f6cd7a722eed85..6bc2f6221fe61e861ece518381c697e4cf4727a1 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1267,6 +1267,9 @@ interface NetworkContext {
+@@ -1278,6 +1278,9 @@ interface NetworkContext {
   SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                        NetworkConditions? conditions);
 
@@ -77,10 +77,10 @@ index cf4d2dcf86b6536c37d46875f74517e478b34928..b19976926137cae56094ec6e292a5014
   SetAcceptLanguage(string new_accept_language);
 
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index da8551db16849cf82a6e3a7eaeb451cae0707f2d..6e20b8dd4f134ea7a8808223cd59064d89f5ce09 100644
+index 81930f3b5ca760d4db9c65aeb36162ddea68a872..5d67e45515480b769ed6555f6e0c18f25fde1e6c 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
-@@ -158,6 +158,7 @@ class TestNetworkContext : public mojom::NetworkContext {
+@@ -159,6 +159,7 @@ class TestNetworkContext : public mojom::NetworkContext {
   void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
   void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                             mojom::NetworkConditionsPtr conditions) override {}
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.

 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 10c3795839969bde6a747da67d5cc7caa44a7179..9810991e0a5d8b931a70e056b6651b8e5fdb9881 100644
+index 0b2956425d2feb84f1d0db7be4f3d4b0875b1d10..f2e37be51049caab4fd6385b5b55f1151708bd82 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -169,6 +169,7 @@
+@@ -171,6 +171,7 @@
 #include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
 #include "third_party/blink/renderer/platform/fonts/font_cache.h"
 #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
@@ -23,7 +23,7 @@ index 10c3795839969bde6a747da67d5cc7caa44a7179..9810991e0a5d8b931a70e056b6651b8e
 #include "third_party/blink/renderer/platform/graphics/image.h"
 #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1859,6 +1860,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1861,6 +1862,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
 #if BUILDFLAG(IS_MAC)
   web_view_impl->SetMaximumLegibleScale(
       prefs.default_maximum_page_scale_factor);
--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
@@ -13,12 +13,12 @@ app.requestSingleInstanceLock API so that users can pass in a JSON
 object for the second instance to send to the first instance.

 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 31f5b160e4cd755cfb56a62b04261ee1bee80277..4305ba61d2489c5817785077d1ace8767b41bdde 100644
+index 085b00fbb3ff95cdcde2a46760ab449808b4c1a9..22d5c994a6944ce7ea725ee045d9801126c32dd4 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
@@ -18,6 +18,8 @@
 #include "base/functional/callback.h"
- #include "base/memory/ref_counted.h"
+ #include "base/memory/scoped_refptr.h"
 #include "base/process/process.h"
 +#include "base/containers/span.h"
 +#include "base/memory/raw_span.h"
@@ -179,7 +179,7 @@ index 08cbe32a258bf478f1da0a07064d3e9ef14c44a5..b9f2a43cb90fac4b031a4b4da38d6435
   if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
     // Try to kill the other process, because it might have been dead.
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce598148418 100644
+index d91f58ebe3a024bc41ed72121c49172f68e0d862..7b85ba5ed8d0c2a152899ad65f275e6680a93dba 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
@@ -81,10 +81,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
@@ -197,7 +197,7 @@ index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce5
   static const int min_message_size = 7;
   if (cds->cbData < min_message_size * sizeof(wchar_t) ||
       cds->cbData % sizeof(wchar_t) != 0) {
-@@ -134,6 +136,37 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+@@ -134,6 +136,23 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
     const std::wstring cmd_line =
         msg.substr(second_null + 1, third_null - second_null);
     *parsed_command_line = base::CommandLine::FromString(cmd_line);
@@ -210,32 +210,18 @@ index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce5
 +      return true;
 +    }
 +
-+    // Get length of the additional data.
-+    const std::wstring additional_data_length_string =
-+        msg.substr(third_null + 1, fourth_null - third_null);
-+    size_t additional_data_length;
-+    base::StringToSizeT(additional_data_length_string, &additional_data_length);
-+
-+    const std::wstring::size_type fifth_null =
-+        msg.find_first_of(L'\0', fourth_null + 1);
-+    if (fifth_null == std::wstring::npos ||
-+        fifth_null == msg.length()) {
-+      LOG(WARNING) << "Invalid format for start command, we need a string in 6 "
-+        "parts separated by NULLs";
-+    }
-+
 +    // Get the actual additional data.
 +    const std::wstring additional_data =
-+        msg.substr(fourth_null + 1, fifth_null - fourth_null);
-+    const uint8_t* additional_data_bytes =
-+        reinterpret_cast<const uint8_t*>(additional_data.c_str());
-+    *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
-+        additional_data_bytes + additional_data_length);
+        msg.substr(third_null + 1, fourth_null - third_null);
+    base::span<const uint8_t> additional_data_bytes =
+        base::as_byte_span(additional_data);
+    *parsed_additional_data = std::vector<uint8_t>(
+        additional_data_bytes.begin(), additional_data_bytes.end());
 +
     return true;
   }
   return false;
-@@ -155,13 +188,14 @@ bool ProcessLaunchNotification(
+@@ -155,13 +174,14 @@ bool ProcessLaunchNotification(
 
   base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
   base::FilePath current_directory;
@@ -253,7 +239,7 @@ index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce5
   return true;
 }
 
-@@ -265,9 +299,11 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -265,9 +285,11 @@ bool ProcessSingleton::EscapeVirtualization(
 ProcessSingleton::ProcessSingleton(
     const std::string& program_name,
     const base::FilePath& user_data_dir,
@@ -265,7 +251,7 @@ index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce5
       program_name_(program_name),
       is_app_sandboxed_(is_app_sandboxed),
       is_virtualized_(false),
-@@ -294,7 +330,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+@@ -294,7 +316,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
     return PROCESS_NONE;
   }
 
@@ -275,7 +261,7 @@ index d91f58ebe3a024bc41ed72121c49172f68e0d862..255160d6bd6b2ea1cd640fde8f4b4ce5
       return PROCESS_NOTIFIED;
     case NotifyChromeResult::NOTIFY_FAILED:
 diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
-index 019ac7e93e009a713ce56ee8bcacf467b4fe769d..9417403bb9cacd0572b37493ab2d98130313db4d 100644
+index 019ac7e93e009a713ce56ee8bcacf467b4fe769d..283693966c041340983aa78a95f8a274db601fb4 100644
 --- a/chrome/browser/win/chrome_process_finder.cc
 +++ b/chrome/browser/win/chrome_process_finder.cc
@@ -39,7 +39,9 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
@@ -289,13 +275,13 @@ index 019ac7e93e009a713ce56ee8bcacf467b4fe769d..9417403bb9cacd0572b37493ab2d9813
   TRACE_EVENT0("startup", "AttemptToNotifyRunningChrome");
 
   DCHECK(remote_window);
-@@ -68,12 +70,29 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
+@@ -68,12 +70,24 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
     new_command_line.AppendSwitchNative(switches::kSourceShortcut, si.lpTitle);
 
   // Send the command line to the remote chrome window.
 -  // Format is "START\0<<<current directory>>>\0<<<commandline>>>".
 +  // Format is
-+  // "START\0<current-directory>\0<command-line>\0<additional-data-length>\0<additional-data>".
+  // "START\0<current-directory>\0<command-line>\0<additional-data>".
   std::wstring to_send = base::StrCat(
       {std::wstring_view{L"START\0", 6}, cur_dir.value(),
        std::wstring_view{L"\0", 1}, new_command_line.GetCommandLineString(),
@@ -303,11 +289,6 @@ index 019ac7e93e009a713ce56ee8bcacf467b4fe769d..9417403bb9cacd0572b37493ab2d9813
 
 +  size_t additional_data_size = additional_data.size_bytes();
 +  if (additional_data_size) {
-+    // Send over the size, because the reinterpret cast to wchar_t could
-+    // add padding.
-+    to_send.append(base::UTF8ToWide(base::NumberToString(additional_data_size)));
-+    to_send.append(L"\0", 1);  // Null separator.
-+
 +    size_t padded_size = additional_data_size / sizeof(wchar_t);
 +    if (additional_data_size % sizeof(wchar_t) != 0) {
 +      padded_size++;
--- a/Show More
+++ b/Show More