chore(todo): debug patch

.devcontainer/devcontainer.json

@@ -1,5 +1,4 @@
 {
-	"name": "Electron Core Development Environment",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "buildtools",
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
@@ -34,15 +33,27 @@
 				"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"
 			}

.devcontainer/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   buildtools:
-    image: ghcr.io/electron/devcontainer:424eedbf277ad9749ffa9219068aa72ed4a5e373
+    image: ghcr.io/electron/devcontainer:77262e58c37631ab082482f42c33cdf68c6c394b
 
     volumes:
       - ..:/workspaces/gclient/src/electron:cached

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -73,7 +73,7 @@ body:
 - type: input
   attributes:
     label: Testcase Gist URL
-    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.
+    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.
     placeholder: https://gist.github.com/...
 - type: textarea
   attributes:

.github/actions/checkout/action.yml

@@ -9,8 +9,6 @@ inputs:
     description: 'Whether to persist the cache to the shared drive'
     required: false
     default: 'true'
-  target-platform:
-    description: 'Target platform, should be linux, win, macos'    
 runs:
   using: "composite"
   steps:
@@ -24,30 +22,36 @@ runs:
     uses: ./src/electron/.github/actions/set-chromium-cookie
   - name: Install Build Tools
     uses: ./src/electron/.github/actions/install-build-tools
+  - name: Get Depot Tools
+    shell: bash
+    run: |
+      if [[ ! -d depot_tools ]]; then
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
+        touch .disable_auto_update
+      fi
+  - name: Add Depot Tools to PATH
+    shell: bash
+    run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
   - name: Generate DEPS Hash
     shell: bash
     run: |
       node src/electron/script/generate-deps-hash.js
-      DEPSHASH="v1-src-cache-$(cat src/electron/.depshash)"
-      echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
-      echo "CACHE_FILE=$DEPSHASH.tar" >> $GITHUB_ENV
-      if [ "${{ inputs.target-platform }}" = "win" ]; then
-        echo "CACHE_DRIVE=/mnt/win-cache" >> $GITHUB_ENV
-      else
-        echo "CACHE_DRIVE=/mnt/cross-instance-cache" >> $GITHUB_ENV
-      fi
+      echo "DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)" >> $GITHUB_ENV
   - name: Generate SAS Key
     if: ${{ inputs.generate-sas-token == 'true' }}
     shell: bash
     run: |
-      curl --unix-socket /var/run/sas/sas.sock --fail "http://foo/$CACHE_FILE?platform=${{ inputs.target-platform }}" > sas-token
+      curl --unix-socket /var/run/sas/sas.sock --fail "http://foo/$DEPSHASH.tar" > sas-token
   - name: Save SAS Key
     if: ${{ inputs.generate-sas-token == 'true' }}
-    uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf
+    uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57
     with:
-      path: sas-token
-      key: sas-key-${{ inputs.target-platform }}-${{ github.run_number }}-${{ github.run_attempt }}
-      enableCrossOsArchive: true
+      path: |
+        sas-token
+      key: sas-key-${{ github.run_number }}-${{ github.run_attempt }}
   - name: Check If Cache Exists
     id: check-cache
     shell: bash
@@ -56,7 +60,7 @@ runs:
         echo "Not using cache this time..."
         echo "cache_exists=false" >> $GITHUB_OUTPUT
       else
-        cache_path=$CACHE_DRIVE/$CACHE_FILE
+        cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
         echo "Using cache key: $DEPSHASH"
         echo "Checking for cache in: $cache_path"
         if [ ! -f "$cache_path" ] || [ `du $cache_path | cut -f1` = "0" ]; then
@@ -72,8 +76,8 @@ runs:
     shell: bash
     run: |    
       # if there is less than 35 GB free space then creating the cache might fail so exit early
-      freespace=`df -m $CACHE_DRIVE | grep -w $CACHE_DRIVE | awk '{print $4}'`
-      freespace_human=`df -h $CACHE_DRIVE | grep -w $CACHE_DRIVE | awk '{print $4}'`
+      freespace=`df -m /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
+      freespace_human=`df -h /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
       if [ $freespace -le 35000 ]; then
         echo "The cross mount cache has $freespace_human free space which is not enough - exiting"
         exit 1
@@ -163,14 +167,14 @@ runs:
     shell: bash
     run: |
       echo "Uncompressed src size: $(du -sh src | cut -f1 -d' ')"
-      tar -cf $CACHE_FILE src
-      echo "Compressed src to $(du -sh $CACHE_FILE | cut -f1 -d' ')"
-      cp ./$CACHE_FILE $CACHE_DRIVE/
+      tar -cf $DEPSHASH.tar src
+      echo "Compressed src to $(du -sh $DEPSHASH.tar | cut -f1 -d' ')"
+      cp ./$DEPSHASH.tar /mnt/cross-instance-cache/
   - name: Persist Src Cache
     if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
     shell: bash
     run: |
-      final_cache_path=$CACHE_DRIVE/$CACHE_FILE
+      final_cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
       echo "Using cache key: $DEPSHASH"
       echo "Checking path: $final_cache_path"
       if [ ! -f "$final_cache_path" ]; then
@@ -179,11 +183,3 @@ 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

.github/actions/cipd-install/action.yml

@@ -1,40 +0,0 @@
-name: 'CIPD install'
-description: 'Installs the specified CIPD package'
-inputs:
-  cipd-root-prefix-path:
-    description: 'Path to prepend to installation directory'
-    default: ''
-  dependency:
-    description: 'Name of dependency to install'
-  deps-file:
-    description: 'Location of DEPS file that defines the dependency'
-  installation-dir:
-    description: 'Location to install dependency'
-  target-platform:
-    description: 'Target platform, should be linux, win, macos'
-  package:
-    description: 'Package to install'
-runs:
-  using: "composite"
-  steps:
-    - name: Delete wrong ${{ inputs.dependency }}
-      shell: bash
-      run : |
-        rm -rf ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }}
-    - name: Create ensure file for ${{ inputs.dependency }}
-      shell: bash
-      run: |
-        echo '${{ inputs.package }}' `e d gclient getdep --deps-file=${{ inputs.deps-file }} -r '${{ inputs.installation-dir }}:${{ inputs.package }}'` > ${{ inputs.dependency }}_ensure_file
-        cat ${{ inputs.dependency }}_ensure_file
-    - name: CIPD installation of ${{ inputs.dependency }} (macOS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      shell: bash
-      run: |
-        echo "ensuring ${{ inputs.dependency }} on macOS"
-        e d cipd ensure --root ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }} -ensure-file ${{ inputs.dependency }}_ensure_file
-    - name: CIPD installation of ${{ inputs.dependency }} (Windows)
-      if: ${{ inputs.target-platform == 'win' }}
-      shell: powershell
-      run: |
-        echo "ensuring ${{ inputs.dependency }} on Windows"
-        e d cipd ensure --root ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }} -ensure-file ${{ inputs.dependency }}_ensure_file

.github/actions/fix-sync-macos/action.yml

@@ -0,0 +1,61 @@
+name: 'Fix Sync macOS'
+description: 'Checks out Electron and stores it in the AKS Cache'
+runs:
+  using: "composite"
+  steps:
+    - name: Fix Sync
+      shell: bash
+      # This step is required to correct for differences between "gclient sync"
+      # on Linux and the expected state on macOS. This requires:
+      # 1. Fixing Clang Install (wrong binary)
+      # 2. Fixing esbuild (wrong binary)
+      # 3. Fixing rustc (wrong binary)
+      # 4. Fixing gn (wrong binary)
+      # 5. Fix reclient (wrong binary)
+      # 6. Fixing dsymutil (wrong binary)
+      # 7. Ensuring we are using the correct ninja and adding it to PATH
+      # 8. Fixing angle (wrong remote)
+      run : |
+        SEDOPTION="-i ''"
+        rm -rf src/third_party/llvm-build
+        python3 src/tools/clang/scripts/update.py
+
+        echo 'infra/3pp/tools/esbuild/${platform}' `gclient getdep --deps-file=src/third_party/devtools-frontend/src/DEPS -r 'third_party/esbuild:infra/3pp/tools/esbuild/${platform}'` > esbuild_ensure_file
+        # Remove extra output from calling gclient getdep which always calls update_depot_tools
+        sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
+        cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
+
+        rm -rf src/third_party/rust-toolchain
+        python3 src/tools/rust/update_rust.py
+        
+        # Prevent calling gclient getdep which always calls update_depot_tools
+        echo 'gn/gn/mac-${arch}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/mac:gn/gn/mac-${arch}'` > gn_ensure_file
+        sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
+        cipd ensure --root src/buildtools/mac -ensure-file gn_ensure_file
+
+        # Prevent calling gclient getdep which always calls update_depot_tools
+        echo 'infra/rbe/client/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/reclient:infra/rbe/client/${platform}'` > gn_ensure_file
+        sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
+        cipd ensure --root src/buildtools/reclient -ensure-file gn_ensure_file
+        python3 src/buildtools/reclient_cfgs/configure_reclient_cfgs.py --rbe_instance "projects/rbe-chrome-untrusted/instances/default_instance" --reproxy_cfg_template reproxy.cfg.template --rewrapper_cfg_project "" --skip_remoteexec_cfg_fetch
+
+        if  [ "${{ env.TARGET_ARCH }}" == "arm64" ]; then
+          DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1
+        else
+          DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1
+        fi
+        python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
+
+        echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file
+        sed $SEDOPTION "s/Updating depot_tools... //g" ninja_ensure_file
+        cipd ensure --root src/third_party/ninja -ensure-file ninja_ensure_file
+
+        echo "$(pwd)/src/third_party/ninja" >> $GITHUB_PATH
+
+        cd src/third_party/angle
+        rm -f .git/objects/info/alternates
+        git remote set-url origin https://chromium.googlesource.com/angle/angle.git
+        cp .git/config .git/config.backup
+        git remote remove origin
+        mv .git/config.backup .git/config
+        git fetch

.github/actions/fix-sync/action.yml

@@ -1,120 +0,0 @@
-name: 'Fix Sync'
-description: 'Ensures proper binaries are in place'
-# This action is required to correct for differences between "gclient sync"
-# on Linux and the expected state on macOS/windows. This requires:
-# 1. Fixing Clang Install (wrong binary)
-# 2. Fixing esbuild (wrong binary)
-# 3. Fixing rustc (wrong binary)
-# 4. Fixing gn (wrong binary)
-# 5. Fix reclient (wrong binary)
-# 6. Fixing dsymutil (wrong binary)
-# 7. Ensuring we are using the correct ninja and adding it to PATH
-# 8. Fixing angle (wrong remote)
-# 9. Install windows toolchain on Windows
-# 10. Fix node binary on Windows
-# 11. Fix rc binary on Windows
-inputs:
-  target-platform:
-    description: 'Target platform, should be linux, win, macos'
-runs:
-  using: "composite"
-  steps:
-    - name: Fix clang
-      shell: bash
-      run : |
-        rm -rf src/third_party/llvm-build
-        python3 src/tools/clang/scripts/update.py
-    - name: Fix esbuild
-      uses: ./src/electron/.github/actions/cipd-install
-      with:
-        cipd-root-prefix-path: src/third_party/devtools-frontend/src/
-        dependency: esbuild
-        deps-file: src/third_party/devtools-frontend/src/DEPS
-        installation-dir: third_party/esbuild
-        target-platform: ${{ inputs.target-platform }}
-        package: infra/3pp/tools/esbuild/${platform}
-    - name: Fix rustc
-      shell: bash
-      run : |
-        rm -rf src/third_party/rust-toolchain
-        python3 src/tools/rust/update_rust.py
-    - name: Fix gn (macOS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/cipd-install
-      with:
-        dependency: gn
-        deps-file: src/DEPS
-        installation-dir: src/buildtools/mac
-        target-platform: ${{ inputs.target-platform }}
-        package: gn/gn/mac-${arch}
-    - name: Fix gn (Windows)
-      if: ${{ inputs.target-platform == 'win' }}
-      uses: ./src/electron/.github/actions/cipd-install
-      with:
-        dependency: gn
-        deps-file: src/DEPS
-        installation-dir: src/buildtools/win 
-        target-platform: ${{ inputs.target-platform }}
-        package: gn/gn/windows-amd64
-    - name: Fix reclient
-      uses: ./src/electron/.github/actions/cipd-install
-      with:
-        dependency: reclient
-        deps-file: src/DEPS
-        installation-dir: src/buildtools/reclient
-        target-platform: ${{ inputs.target-platform }}
-        package: infra/rbe/client/${platform}
-    - name: Configure reclient configs
-      shell: bash
-      run : |
-        python3 src/buildtools/reclient_cfgs/configure_reclient_cfgs.py --rbe_instance "projects/rbe-chrome-untrusted/instances/default_instance" --reproxy_cfg_template reproxy.cfg.template --rewrapper_cfg_project "" --skip_remoteexec_cfg_fetch
-    - name: Fix dsymutil (macOS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      shell: bash
-      run : |
-        # Fix dsymutil
-        if [ "${{ inputs.target-platform }}" = "macos" ]; then
-          if  [ "${{ env.TARGET_ARCH }}" == "arm64" ]; then
-            DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1
-          else
-            DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1
-          fi
-          python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
-        fi
-    - name: Fix ninja
-      uses: ./src/electron/.github/actions/cipd-install
-      with:
-        dependency: ninja
-        deps-file: src/DEPS
-        installation-dir: src/third_party/ninja
-        target-platform: ${{ inputs.target-platform }}
-        package: infra/3pp/tools/ninja/${platform}
-    - name: Set ninja in path
-      shell: bash
-      run : |
-        echo "$(pwd)/src/third_party/ninja" >> $GITHUB_PATH
-    - name: Fixup angle git
-      shell: bash
-      run : |
-        cd src/third_party/angle
-        rm -f .git/objects/info/alternates
-        git remote set-url origin https://chromium.googlesource.com/angle/angle.git
-        cp .git/config .git/config.backup
-        git remote remove origin
-        mv .git/config.backup .git/config
-        git fetch
-    - name: Get Windows toolchain
-      if: ${{ inputs.target-platform == 'win' }}
-      shell: powershell
-      run: e d vpython3 src\build\vs_toolchain.py update --force
-    - name: Download nodejs
-      if: ${{ inputs.target-platform == 'win' }}
-      shell: powershell
-      run: |
-        $nodedeps = e d gclient getdep --deps-file=src/DEPS -r src/third_party/node/win | ConvertFrom-JSON
-        python3 src\third_party\depot_tools\download_from_google_storage.py --no_resume --no_auth --bucket chromium-nodejs -o src\third_party\node\win\node.exe $nodedeps.object_name
-    - name: Install rc
-      if: ${{ inputs.target-platform == 'win' }}
-      shell: bash
-      run: |
-        python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang/rc -s src/build/toolchain/win/rc/win/rc.exe.sha1

.github/actions/install-build-tools/action.yml

@@ -10,16 +10,11 @@ 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=6e8526315ea3b4828882497e532b8340e64e053c
+      export BUILD_TOOLS_SHA=8246e57791b0af4ae5975eb96f09855f9269b1cd
       npm i -g @electron/build-tools
       e auto-update disable
-      e d auto-update disable
       if [ "$(expr substr $(uname -s) 1 10)" == "MSYS_NT-10" ]; then
         e d cipd.bat --version
         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

.github/actions/restore-cache-aks/action.yml

@@ -1,20 +1,12 @@
 name: 'Restore Cache AKS'
 description: 'Restores Electron src cache via AKS'
-inputs:
-  target-platform:
-    description: 'Target platform, should be linux, win, macos'
 runs:
   using: "composite"
   steps:
   - name: Restore and Ensure Src Cache
     shell: bash
     run: |
-      if [ "${{ inputs.target-platform }}" = "win" ]; then
-        cache_path=/mnt/win-cache/$DEPSHASH.tar
-      else
-        cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
-      fi
-
+      cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
       echo "Using cache key: $DEPSHASH"
       echo "Checking for cache in: $cache_path"
       if [ ! -f "$cache_path" ]; then

.github/actions/restore-cache-azcopy/action.yml

@@ -1,25 +1,22 @@
 name: 'Restore Cache AZCopy'
 description: 'Restores Electron src cache via AZCopy'
-inputs:
-  target-platform:
-    description: 'Target platform, should be linux, win, macos'
 runs:
   using: "composite"
   steps:
   - name: Obtain SAS Key
     continue-on-error: true
-    uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf
+    uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
     with:
-      path: sas-token
-      key: sas-key-${{ inputs.target-platform }}-${{ github.run_number }}-1
-      enableCrossOsArchive: true
+      path: |
+        sas-token
+      key: sas-key-${{ github.run_number }}-1
   - name: Obtain SAS Key
     continue-on-error: true
-    uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf
+    uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
     with:
-      path: sas-token
-      key: sas-key-${{ inputs.target-platform }}-${{ github.run_number }}-${{ github.run_attempt }}
-      enableCrossOsArchive: true
+      path: |
+        sas-token
+      key: sas-key-${{ github.run_number }}-${{ github.run_attempt }}
   - name: Download Src Cache from AKS
     # The cache will always exist here as a result of the checkout job
     # Either it was uploaded to Azure in the checkout job for this commit
@@ -29,30 +26,21 @@ runs:
       timeout_minutes: 30
       max_attempts: 3
       retry_on: error
-      shell: bash
       command: |
         sas_token=$(cat sas-token)
         if [ -z $sas-token ]; then
           echo "SAS Token not found; exiting src cache download early..."
           exit 1
-        else
-          if [ "${{ inputs.target-platform }}" = "win" ]; then
-            azcopy copy --log-level=ERROR \
-            "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_WIN_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
-          else
-            azcopy copy --log-level=ERROR \
-            "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
-          fi            
         fi
+        azcopy copy --log-level=ERROR \
+          "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
     env:
       AZURE_AKS_CACHE_STORAGE_ACCOUNT: f723719aa87a34622b5f7f3
       AZURE_AKS_CACHE_SHARE_NAME: pvc-f6a4089f-b082-4bee-a3f9-c3e1c0c02d8f
-      AZURE_AKS_WIN_CACHE_SHARE_NAME: pvc-71dec4f2-0d44-4fd1-a2c3-add049d70bdf
   - name: Clean SAS Key
     shell: bash
     run: rm -f sas-token
   - name: Unzip and Ensure Src Cache
-    if: ${{ inputs.target-platform == 'macos' }}
     shell: bash
     run: |
       echo "Downloaded cache is $(du -sh $DEPSHASH.tar | cut -f1)"
@@ -80,45 +68,4 @@ runs:
       fi
 
       echo "Wiping Electron Directory"
-      rm -rf src/electron
-
-  - name: Unzip and Ensure Src Cache (Windows)
-    if: ${{ inputs.target-platform == 'win' }}
-    shell: powershell
-    run: |
-      $src_cache = "$env:DEPSHASH.tar"
-      $cache_size = $(Get-Item $src_cache).length
-      Write-Host "Downloaded cache is $cache_size"
-      if ($cache_size -eq 0) {
-        Write-Host "Cache is empty - exiting"
-        exit 1
-      }
-
-      $TEMP_DIR=New-Item -ItemType Directory -Path temp-cache
-      $TEMP_DIR_PATH = $TEMP_DIR.FullName
-      C:\ProgramData\Chocolatey\bin\7z.exe -y x $src_cache -o"$TEMP_DIR_PATH"
-
-  - name: Move Src Cache (Windows)
-    if: ${{ inputs.target-platform == 'win' }}
-    uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
-    with:
-      timeout_minutes: 30
-      max_attempts: 3
-      retry_on: error
-      shell: powershell  
-      command: |
-        if (Test-Path "temp-cache\src") {
-          Write-Host "Relocating Cache"
-          Remove-Item -Recurse -Force src
-          Move-Item temp-cache\src src
-
-          Write-Host "Deleting zip file"
-          Remove-Item -Force $src_cache
-        }
-        if (-Not (Test-Path "src\third_party\blink")) {
-          Write-Host "Cache was not correctly restored - exiting"
-          exit 1
-        }
-
-        Write-Host "Wiping Electron Directory"
-        Remove-Item -Recurse -Force src\electron
+      rm -rf src/electron

.github/actions/set-chromium-cookie/action.yml

@@ -4,14 +4,9 @@ runs:
   using: "composite"
   steps:
   - name: Set the git cookie from chromium.googlesource.com (Unix)
-    if: ${{ runner.os != 'Windows' }}
+    if: ${{ runner.os != 'Windows' && env.CHROMIUM_GIT_COOKIE }}
     shell: bash
     run: |
-      if [[ -z "${{ env.CHROMIUM_GIT_COOKIE }}" ]]; then
-        echo "CHROMIUM_GIT_COOKIE is not set - cannot authenticate."
-        exit 0
-      fi
-
       eval 'set +o history' 2>/dev/null || setopt HIST_IGNORE_SPACE 2>/dev/null
       touch ~/.gitcookies
       chmod 0600 ~/.gitcookies
@@ -22,37 +17,10 @@ runs:
       ${{ env.CHROMIUM_GIT_COOKIE }}
       __END__
       eval 'set -o history' 2>/dev/null || unsetopt HIST_IGNORE_SPACE 2>/dev/null
-
-      RESPONSE=$(curl -s -b ~/.gitcookies https://chromium-review.googlesource.com/a/accounts/self)
-      if [[ $RESPONSE == ")]}'"* ]]; then
-        # Extract account email for verification
-        EMAIL=$(echo "$RESPONSE" | tail -c +5 | jq -r '.email // "No email found"')
-        echo "Cookie authentication successful - authenticated as: $EMAIL"
-      else
-        echo "Cookie authentication failed - ensure CHROMIUM_GIT_COOKIE is set correctly"
-        echo $RESPONSE
-      fi
   - name: Set the git cookie from chromium.googlesource.com (Windows)
-    if: ${{ runner.os == 'Windows' }}
+    if: ${{ runner.os == 'Windows' && env.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
     shell: cmd
     run: |
-      if "%CHROMIUM_GIT_COOKIE_WINDOWS_STRING%"=="" (
-        echo CHROMIUM_GIT_COOKIE_WINDOWS_STRING is not set - cannot authenticate.
-        exit /b 0
-      )
-
       git config --global http.cookiefile "%USERPROFILE%\.gitcookies"
       powershell -noprofile -nologo -command Write-Output "${{ env.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}" >>"%USERPROFILE%\.gitcookies"
 
-      curl -s -b "%USERPROFILE%\.gitcookies" https://chromium-review.googlesource.com/a/accounts/self > response.txt
-
-      findstr /B /C:")]}'" response.txt > nul
-      if %ERRORLEVEL% EQU 0 (
-        echo Cookie authentication successful
-        powershell -NoProfile -Command "& {$content = Get-Content -Raw response.txt; $content = $content.Substring(4); try { $json = ConvertFrom-Json $content; if($json.email) { Write-Host 'Authenticated as:' $json.email } else { Write-Host 'No email found in response' } } catch { Write-Host 'Error parsing JSON:' $_ }}"
-      ) else (
-        echo Cookie authentication failed - ensure CHROMIUM_GIT_COOKIE_WINDOWS_STRING is set correctly
-        type response.txt
-      )
-
-      del response.txt

.github/workflows/archaeologist-dig.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Node.js/npm
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
         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@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4.6.1
         with:
           name: artifacts
           path: electron/artifacts

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       build-image-sha:
         type: string
         description: 'SHA for electron/build image'
-        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
+        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
         required: true
       skip-macos:
         type: boolean
@@ -30,7 +30,7 @@ on:
         required: false
   push:
     branches:
-      - main
+      - sckp-macos15
       - '[1-9][0-9]-x-y'
   pull_request:
 
@@ -64,7 +64,7 @@ jobs:
       id: set-output
       run: |
         if [ -z "${{ inputs.build-image-sha }}" ]; then
-          echo "build-image-sha=424eedbf277ad9749ffa9219068aa72ed4a5e373" >> "$GITHUB_OUTPUT"
+          echo "build-image-sha=bc2f48b2415a670de18d13605b1cf0eb5fdbaae1" >> "$GITHUB_OUTPUT"
         else
           echo "build-image-sha=${{ inputs.build-image-sha }}" >> "$GITHUB_OUTPUT"
         fi
@@ -115,7 +115,6 @@ jobs:
       uses: ./src/electron/.github/actions/checkout
       with:
         generate-sas-token: 'true'
-        target-platform: macos
 
   checkout-linux:
     needs: setup
@@ -151,8 +150,7 @@ jobs:
       image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
       options: --user root --device /dev/fuse --cap-add SYS_ADMIN
       volumes:
-        - /mnt/win-cache:/mnt/win-cache
-        - /var/run/sas:/var/run/sas
+        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
     env:
       CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
       CHROMIUM_GIT_COOKIE_WINDOWS_STRING: ${{ secrets.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
@@ -170,9 +168,6 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Checkout & Sync & Save
       uses: ./src/electron/.github/actions/checkout
-      with:
-        generate-sas-token: 'true'
-        target-platform: win
 
   # GN Check Jobs
   macos-gn-check:
@@ -203,7 +198,7 @@ jobs:
       target-platform: win
       target-archs: x64 x86 arm64
       check-runs-on: electron-arc-linux-amd64-8core
-      check-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-windows.outputs.build-image-sha }}","options":"--user root --device /dev/fuse --cap-add SYS_ADMIN","volumes":["/mnt/win-cache:/mnt/win-cache"]}'
+      check-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-windows.outputs.build-image-sha }}","options":"--user root --device /dev/fuse --cap-add SYS_ADMIN","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
       gn-build-type: testing
     secrets: inherit
 
@@ -331,7 +326,7 @@ jobs:
       issues: read
       pull-requests: read
     uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-windows
+    needs: setup
     if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
     with:
       build-runs-on: electron-arc-windows-amd64-16core
@@ -350,7 +345,7 @@ jobs:
       issues: read
       pull-requests: read
     uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-windows
+    needs: setup
     if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
     with:
       build-runs-on: electron-arc-windows-amd64-16core
@@ -369,7 +364,7 @@ jobs:
       issues: read
       pull-requests: read
     uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-windows
+    needs: setup
     if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
     with:
       build-runs-on: electron-arc-windows-amd64-16core

.github/workflows/clean-src-cache.yml

@@ -16,7 +16,6 @@ jobs:
       options: --user root
       volumes:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /mnt/win-cache:/mnt/win-cache
     steps:
     - name: Cleanup Source Cache
       shell: bash
@@ -24,6 +23,3 @@ jobs:
         df -h /mnt/cross-instance-cache
         find /mnt/cross-instance-cache -type f -mtime +15 -delete
         df -h /mnt/cross-instance-cache
-        df -h /mnt/win-cache
-        find /mnt/win-cache -type f -mtime +15 -delete
-        df -h /mnt/win-cache

.github/workflows/linux-publish.yml

@@ -6,7 +6,7 @@ on:
       build-image-sha:
         type: string
         description: 'SHA for electron/build image'
-        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
+        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
       upload-to-storage:
         description: 'Uploads to Azure storage'
         required: false
@@ -27,7 +27,6 @@ jobs:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
         - /var/run/sas:/var/run/sas
     env:
-      CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     steps:
     - name: Checkout Electron

.github/workflows/macos-publish.yml

@@ -6,7 +6,7 @@ on:
       build-image-sha:
         type: string
         description: 'SHA for electron/build image'
-        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
+        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
         required: true
       upload-to-storage:
         description: 'Uploads to Azure storage'
@@ -28,7 +28,6 @@ jobs:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
         - /var/run/sas:/var/run/sas
     env:
-      CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     steps:
     - name: Checkout Electron
@@ -40,7 +39,6 @@ jobs:
       uses: ./src/electron/.github/actions/checkout
       with:
         generate-sas-token: 'true'
-        target-platform: macos
 
   publish-x64-darwin:
     uses: ./.github/workflows/pipeline-segment-electron-build.yml

.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@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
       with:
         node-version: 20.11.x
         cache: yarn
@@ -129,8 +129,24 @@ jobs:
         echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
     - name: Set Chromium Git Cookie
       uses: ./src/electron/.github/actions/set-chromium-cookie
-    - name: Install Build Tools
-      uses: ./src/electron/.github/actions/install-build-tools      
+    - name: Get Depot Tools
+      timeout-minutes: 5
+      run: |
+        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+
+        SEDOPTION="-i"
+        if [ "`uname`" = "Darwin" ]; then
+          SEDOPTION="-i ''"
+        fi
+
+        # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
+        sed $SEDOPTION '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
+        touch .disable_auto_update
+    - name: Add Depot Tools to PATH
+      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Generate DEPS Hash
       run: |
         node src/electron/script/generate-deps-hash.js
@@ -138,26 +154,24 @@ jobs:
         echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
         echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
     - name: Restore src cache via AZCopy
-      if: ${{ inputs.target-platform != 'linux' }}
+      if: ${{ inputs.target-platform == 'macos' }}
       uses: ./src/electron/.github/actions/restore-cache-azcopy
-      with:
-        target-platform: ${{ inputs.target-platform }}
     - name: Restore src cache via AKS
       if: ${{ inputs.target-platform == 'linux' }}
       uses: ./src/electron/.github/actions/restore-cache-aks
+    - name: Checkout src via gclient sync
+      if: ${{ inputs.target-platform == 'win' }}
+      uses: ./src/electron/.github/actions/checkout
+      with:
+        use-cache: 'false'
     - name: Checkout Electron
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         path: src/electron
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.sha }}
-    - name: Fix Sync
-      if: ${{ inputs.target-platform != 'linux' }}
-      uses: ./src/electron/.github/actions/fix-sync
-      with:
-        target-platform: ${{ inputs.target-platform }}
-      env:
-        ELECTRON_DEPOT_TOOLS_DISABLE_LOG: true
+    - name: Install Build Tools
+      uses: ./src/electron/.github/actions/install-build-tools
     - name: Init Build Tools
       run: |
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
@@ -170,6 +184,9 @@ jobs:
         echo "DEPSHASH=$(cat src/electron/.depshash)" >> $GITHUB_ENV
     - name: Add CHROMIUM_BUILDTOOLS_PATH to env
       run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
+    - name: Fix Sync (macOS)
+      if: ${{ inputs.target-platform == 'macos' }}
+      uses: ./src/electron/.github/actions/fix-sync-macos
     - name: Setup Number of Ninja Processes
       run: |
         echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform != 'macos' && '300' || '200' }}" >> $GITHUB_ENV

.github/workflows/pipeline-segment-electron-gn-check.yml

@@ -65,9 +65,7 @@ jobs:
         sudo rm -rf $TMPDIR/del-target
     - name: Check disk space after freeing up space
       if: ${{ inputs.target-platform == 'macos' }}
-      run: df -h
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
+      run: df -h        
     - name: Install Build Tools
       uses: ./src/electron/.github/actions/install-build-tools
     - name: Enable windows toolchain
@@ -83,13 +81,9 @@ jobs:
     - name: Restore src cache via AZCopy
       if: ${{ inputs.target-platform == 'macos' }}
       uses: ./src/electron/.github/actions/restore-cache-azcopy
-      with:
-        target-platform: ${{ inputs.target-platform }}      
     - name: Restore src cache via AKS
       if: ${{ inputs.target-platform == 'linux' || inputs.target-platform == 'win' }}
       uses: ./src/electron/.github/actions/restore-cache-aks
-      with:
-        target-platform: ${{ inputs.target-platform }}
     - name: Run Electron Only Hooks
       run: |
         echo "solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]" > tmpgclient

.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@49933ea5288caeca8642d1e84afbd3f7d6820020
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
       with:
         node-version: 20.11.x
     - name: Add TCC permissions on macOS
@@ -134,8 +134,6 @@ 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
@@ -149,12 +147,12 @@ jobs:
         echo "DISABLE_CRASH_REPORTER_TESTS=true" >> $GITHUB_ENV
         echo "IS_ASAN=true" >> $GITHUB_ENV
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       with:
         name: generated_artifacts_${{ env.ARTIFACT_KEY }}
         path: ./generated_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
     - name: Download Src Artifacts
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       with:
         name: src_artifacts_${{ env.ARTIFACT_KEY }}
         path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
@@ -249,7 +247,7 @@ jobs:
       if: always() && !cancelled()
     - name: Upload Test Artifacts
       if: always() && !cancelled()
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
       with:
         name: test_artifacts_${{ env.ARTIFACT_KEY }}_${{ matrix.shard }}
         path: src/electron/spec/artifacts

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -60,13 +60,22 @@ jobs:
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
+    - name: Get Depot Tools
+      timeout-minutes: 5
+      run: |
+        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
+        touch .disable_auto_update
+    - name: Add Depot Tools to PATH
+      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       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@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       with:
         name: src_artifacts_linux_${{ env.TARGET_ARCH }}
         path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
@@ -105,8 +114,6 @@ jobs:
         path: src/electron
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.sha }}
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Install Build Tools
       uses: ./src/electron/.github/actions/install-build-tools
     - name: Init Build Tools
@@ -114,13 +121,24 @@ jobs:
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
+    - name: Set Chromium Git Cookie
+      uses: ./src/electron/.github/actions/set-chromium-cookie
+    - name: Get Depot Tools
+      timeout-minutes: 5
+      run: |
+        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
+        touch .disable_auto_update
+    - name: Add Depot Tools to PATH
+      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       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@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
       with:
         name: src_artifacts_linux_${{ env.TARGET_ARCH }}
         path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}

.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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: SARIF file
           path: results.sarif
@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

.github/workflows/windows-publish.yml

@@ -6,7 +6,7 @@ on:
       build-image-sha:
         type: string
         description: 'SHA for electron/build image'
-        default: '424eedbf277ad9749ffa9219068aa72ed4a5e373'
+        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
         required: true
       upload-to-storage:
         description: 'Uploads to Azure storage'
@@ -25,10 +25,8 @@ jobs:
       image: ghcr.io/electron/build:${{ inputs.build-image-sha }}
       options: --user root --device /dev/fuse --cap-add SYS_ADMIN
       volumes:
-        - /mnt/win-cache:/mnt/win-cache
-        - /var/run/sas:/var/run/sas
+        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
     env:
-      CHROMIUM_GIT_COOKIE_WINDOWS_STRING: ${{ secrets.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_win=True'
       TARGET_OS: 'win'
       ELECTRON_DEPOT_TOOLS_WIN_TOOLCHAIN: '1'
@@ -42,9 +40,6 @@ jobs:
         fetch-depth: 0
     - name: Checkout & Sync & Save
       uses: ./src/electron/.github/actions/checkout
-      with:
-        generate-sas-token: 'true'
-        target-platform: win
 
   publish-x64-win:
     uses: ./.github/workflows/pipeline-segment-electron-build.yml

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 = "build/electron_resources.grd"
+  source = "electron_resources.grd"
 
   outputs = [
     "grit/electron_resources.h",
@@ -670,8 +670,6 @@ 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",
     ]
@@ -1248,7 +1246,7 @@ if (is_mac) {
         "//components/crash/core/app:run_as_crashpad_handler",
       ]
 
-      ldflags = [ "/DELAYLOAD:ffmpeg.dll" ]
+      ldflags = []
 
       libs = [
         "comctl32.lib",

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '138.0.7160.0',
+    '136.0.7067.0',
   'node_version':
-    'v22.15.0',
+    'v22.14.0',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':

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 = 136
+node_module_version = 135
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"

chromium_src/BUILD.gn

@@ -85,8 +85,6 @@ 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",
@@ -146,8 +144,6 @@ 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",

docs/README.md

@@ -96,9 +96,8 @@ These individual tutorials expand on topics discussed in the guide above.
 * [Chrome Extensions Support](api/extensions.md)
 * [Breaking API Changes](breaking-changes.md)
 
-### Custom Web Features:
+### Custom DOM Elements:
 
-* [`-electron-corner-smoothing` CSS Rule](api/corner-smoothing-css.md)
 * [`<webview>` Tag](api/webview-tag.md)
 * [`window.open` Function](api/window-open.md)
 

docs/api/app.md

@@ -1110,11 +1110,6 @@ 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
@@ -1490,7 +1485,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
 
@@ -1584,7 +1579,6 @@ 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`
 

docs/api/base-window.md

@@ -342,12 +342,12 @@ Emitted when the window has closed a sheet.
 
 Emitted when the native new tab button is clicked.
 
-#### Event: 'system-context-menu' _Windows_ _Linux_
+#### Event: 'system-context-menu' _Windows_
 
 Returns:
 
 * `event` Event
-* `point` [Point](structures/point.md) - The screen coordinates where the context menu was triggered.
+* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
 
 Emitted when the system context menu is triggered on the window, this is
 normally only triggered when the user right clicks on the non-client area
@@ -356,8 +356,6 @@ 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-linux).
-
 ### Static Methods
 
 The `BaseWindow` class has the following static methods:
@@ -398,7 +396,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` _Linux_ _Windows_
+#### `win.autoHideMenuBar`
 
 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.
 
@@ -513,10 +511,6 @@ A `string` property that defines an alternative title provided only to
 accessibility tools such as screen readers. This string is not directly
 visible to users.
 
-#### `win.snapped` _Windows_ _Readonly_
-
-A `boolean` property that indicates whether the window is arranged via [Snap.](https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241)
-
 ### Instance Methods
 
 Objects created with `new BaseWindow` have the following instance methods:
@@ -1270,13 +1264,6 @@ Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
 
 Returns `boolean` - Whether the menu bar is visible.
 
-#### `win.isSnapped()` _Windows_
-
-Returns `boolean` - whether the window is arranged via [Snap.](https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241)
-
-The window is snapped via buttons shown when the mouse is hovered over window
-maximize button, or by dragging it to the edges of the screen.
-
 #### `win.setVisibleOnAllWorkspaces(visible[, options])` _macOS_ _Linux_
 
 * `visible` boolean

docs/api/browser-window.md

@@ -421,12 +421,12 @@ Emitted when the window has closed a sheet.
 
 Emitted when the native new tab button is clicked.
 
-#### Event: 'system-context-menu' _Windows_ _Linux_
+#### Event: 'system-context-menu' _Windows_
 
 Returns:
 
 * `event` Event
-* `point` [Point](structures/point.md) - The screen coordinates where the context menu was triggered.
+* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
 
 Emitted when the system context menu is triggered on the window, this is
 normally only triggered when the user right clicks on the non-client area
@@ -435,8 +435,6 @@ 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-linux).
-
 ### Static Methods
 
 The `BrowserWindow` class has the following static methods:
@@ -499,7 +497,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` _Linux_ _Windows_
+#### `win.autoHideMenuBar`
 
 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.
 
@@ -613,10 +611,6 @@ A `string` property that defines an alternative title provided only to
 accessibility tools such as screen readers. This string is not directly
 visible to users.
 
-#### `win.snapped` _Windows_ _Readonly_
-
-A `boolean` property that indicates whether the window is arranged via [Snap.](https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241)
-
 ### Instance Methods
 
 Objects created with `new BrowserWindow` have the following instance methods:
@@ -1451,13 +1445,6 @@ Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
 
 Returns `boolean` - Whether the menu bar is visible.
 
-#### `win.isSnapped()` _Windows_
-
-Returns `boolean` - whether the window is arranged via [Snap.](https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241)
-
-The window is snapped via buttons shown when the mouse is hovered over window
-maximize button, or by dragging it to the edges of the screen.
-
 #### `win.setVisibleOnAllWorkspaces(visible[, options])` _macOS_ _Linux_
 
 * `visible` boolean

docs/api/command-line.md

@@ -20,87 +20,45 @@ document.
 
 #### `commandLine.appendSwitch(switch[, value])`
 
-* `switch` string - A command-line switch, without the leading `--`.
-* `value` string (optional) - A value for the given switch.
+* `switch` string - A command-line switch, without the leading `--`
+* `value` string (optional) - A value for the given switch
 
 Append a switch (with optional `value`) to Chromium's command line.
 
 **Note:** This will not affect `process.argv`. The intended usage of this function is to
 control Chromium's behavior.
 
-```js
-const { app } = require('electron')
-
-app.commandLine.appendSwitch('remote-debugging-port', '8315')
-```
-
 #### `commandLine.appendArgument(value)`
 
-* `value` string - The argument to append to the command line.
+* `value` string - The argument to append to the command line
 
 Append an argument to Chromium's command line. The argument will be quoted
 correctly. Switches will precede arguments regardless of appending order.
 
 If you're appending an argument like `--switch=value`, consider using `appendSwitch('switch', 'value')` instead.
 
-```js
-const { app } = require('electron')
-
-app.commandLine.appendArgument('--enable-experimental-web-platform-features')
-```
-
 **Note:** This will not affect `process.argv`. The intended usage of this function is to
 control Chromium's behavior.
 
 #### `commandLine.hasSwitch(switch)`
 
-* `switch` string - A command-line switch.
+* `switch` string - A command-line switch
 
 Returns `boolean` - Whether the command-line switch is present.
 
-```js
-const { app } = require('electron')
-
-app.commandLine.appendSwitch('remote-debugging-port', '8315')
-const hasPort = app.commandLine.hasSwitch('remote-debugging-port')
-console.log(hasPort) // true
-```
-
 #### `commandLine.getSwitchValue(switch)`
 
-* `switch` string - A command-line switch.
+* `switch` string - A command-line switch
 
 Returns `string` - The command-line switch value.
 
-This function is meant to obtain Chromium command line switches. It is not
-meant to be used for application-specific command line arguments. For the
-latter, please use `process.argv`.
-
-```js
-const { app } = require('electron')
-
-app.commandLine.appendSwitch('remote-debugging-port', '8315')
-const portValue = app.commandLine.getSwitchValue('remote-debugging-port')
-console.log(portValue) // '8315'
-```
-
 **Note:** When the switch is not present or has no value, it returns empty string.
 
 #### `commandLine.removeSwitch(switch)`
 
-* `switch` string - A command-line switch.
+* `switch` string - A command-line switch
 
 Removes the specified switch from Chromium's command line.
 
-```js
-const { app } = require('electron')
-
-app.commandLine.appendSwitch('remote-debugging-port', '8315')
-console.log(app.commandLine.hasSwitch('remote-debugging-port')) // true
-
-app.commandLine.removeSwitch('remote-debugging-port')
-console.log(app.commandLine.hasSwitch('remote-debugging-port')) // false
-```
-
 **Note:** This will not affect `process.argv`. The intended usage of this function is to
 control Chromium's behavior.

docs/api/corner-smoothing-css.md

@@ -1,78 +0,0 @@
-## CSS Rule: `-electron-corner-smoothing`
-
-> Smoothes out the corner rounding of the `border-radius` CSS rule.
-
-The rounded corners of elements with [the `border-radius` CSS rule](https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius) can be smoothed out using the `-electron-corner-smoothing` CSS rule. This smoothness is very similar to Apple's "continuous" rounded corners in SwiftUI and Figma's "corner smoothing" control on design elements.
-
-![There is a black rectangle on the left using simple rounded corners, and a blue rectangle on the right using smooth rounded corners. In between those rectangles is a magnified view of the same corner from both rectangles overlapping to show the subtle difference in shape.](../images/corner-smoothing-summary.svg)
-
-Integrating with the operating system and its design language is important to many desktop applications. The shape of a rounded corner can be a subtle detail to many users. However, aligning closely to the system's design language that users are familiar with makes the application's design feel familiar too. Beyond matching the design language of macOS, designers may decide to use smoother round corners for many other reasons.
-
-`-electron-corner-smoothing` affects the shape of borders, outlines, and shadows on the target element. Mirroring the behavior of `border-radius`, smoothing will gradually back off if an element's size is too small for the chosen value.
-
-The `-electron-corner-smoothing` CSS rule is **only implemented for Electron** and has no effect in browsers. Avoid using this rule outside of Electron. This CSS rule is considered experimental and may require migration in the future if replaced by a CSS standard.
-
-### Example
-
-The following example shows the effect of corner smoothing at different percents.
-
-```css
-.box {
-  width: 128px;
-  height: 128px;
-  background-color: cornflowerblue;
-  border-radius: 24px;
-  -electron-corner-smoothing: var(--percent);  /* Column header in table below. */
-}
-```
-
-| 0% | 30% | 60% | 100% |
-| --- | --- | --- | --- |
-| ![A rectangle with round corners at 0% smoothness](../images/corner-smoothing-example-0.svg) | ![A rectangle with round corners at 30% smoothness](../images/corner-smoothing-example-30.svg) | ![A rectangle with round corners at 60% smoothness](../images/corner-smoothing-example-60.svg) | ![A rectangle with round corners at 100% smoothness](../images/corner-smoothing-example-100.svg) |
-
-### Matching the system UI
-
-Use the `system-ui` keyword to match the smoothness to the OS design language.
-
-```css
-.box {
-  width: 128px;
-  height: 128px;
-  background-color: cornflowerblue;
-  border-radius: 24px;
-  -electron-corner-smoothing: system-ui;  /* Match the system UI design. */
-}
-```
-
-| OS: | macOS | Windows, Linux |
-| --- | --- | --- |
-| Value: | `60%` | `0%` |
-| Example: | ![A rectangle with round corners whose smoothness matches macOS](../images/corner-smoothing-example-60.svg) | ![A rectangle with round corners whose smoothness matches Windows and Linux](../images/corner-smoothing-example-0.svg) |
-
-### Controlling availibility
-
-This CSS rule can be disabled by setting [the `cornerSmoothingCSS` web preference](./structures/web-preferences.md) to `false`.
-
-```js
-const myWindow = new BrowserWindow({
-  // [...]
-  webPreferences: {
-    enableCornerSmoothingCSS: false // Disables the `-electron-corner-smoothing` CSS rule
-  }
-})
-```
-
-The CSS rule will still parse, but will have no visual effect.
-
-### Formal reference
-
-* **Initial value**: `0%`
-* **Inherited**: No
-* **Animatable**: No
-* **Computed value**: As specified
-
-```css
--electron-corner-smoothing =
-  <percentage [0,100]>  |
-  system-ui
-```

docs/api/desktop-capturer.md

@@ -17,7 +17,8 @@ app.whenReady().then(() => {
 
   session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
     desktopCapturer.getSources({ types: ['screen'] }).then((sources) => {
-      // Grant access to the first screen found.
+      // Your app shows some UI, but in this example
+      // grant access to the first screen found.
       callback({ video: sources[0], audio: 'loopback' })
     })
     // If true, use the system picker if available.
@@ -42,7 +43,8 @@ startButton.addEventListener('click', () => {
     video: {
       width: 320,
       height: 240,
-      frameRate: 30
+      frameRate: 30,
+      displaySurface: 'monitor'
     }
   }).then(stream => {
     video.srcObject = stream
@@ -98,6 +100,16 @@ which can detected by [`systemPreferences.getMediaAccessStatus`][].
 [`navigator.mediaDevices.getUserMedia`]: https://developer.mozilla.org/en/docs/Web/API/MediaDevices/getUserMedia
 [`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-windows-macos
 
+### `desktopCapturer.isDisplayMediaSystemPickerAvailable()` _Experimental_ _macOS_
+
+Returns `Boolean`, whether or not requesting desktop content via
+the system picker is supported on this platform.
+
+Currently this will only return `true` on macOS 14.4 and higher. When
+true, use the `getNativePickerSource` method to return the system picker's
+selected media stream. Not doing so may cause a warning dialog to your users
+on macOS 15 and higher.
+
 ## Caveats
 
 `navigator.mediaDevices.getUserMedia` does not work on macOS for audio capture due to a fundamental limitation whereby apps that want to access the system's audio require a [signed kernel extension](https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/KernelExtensions/KernelExtensions.html). Chromium, and by extension Electron, does not provide this.

docs/api/dock.md

@@ -9,7 +9,7 @@ The following example shows how to bounce your icon on the dock.
 
 ```js
 const { app } = require('electron')
-app.dock?.bounce()
+app.dock.bounce()
 ```
 
 ### Instance Methods

docs/api/menu.md

@@ -73,8 +73,6 @@ 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, 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.

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 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
+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
 a valid image.
 
 ```js
@@ -271,12 +271,16 @@ changes:
 
 Returns `string` - The [Data URL][data-url] of the image.
 
-#### `image.getBitmap([options])` _Deprecated_
+#### `image.getBitmap([options])`
 
 * `options` Object (optional)
   * `scaleFactor` Number (optional) - Defaults to 1.0.
 
-Legacy alias for `image.toBitmap()`.
+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.
 
 #### `image.getNativeHandle()` _macOS_
 

docs/api/native-theme.md

@@ -63,14 +63,6 @@ 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

docs/api/push-notifications.md

@@ -46,7 +46,4 @@ See: https://developer.apple.com/documentation/appkit/nsapplication/1428476-regi
 ### `pushNotifications.unregisterForAPNSNotifications()` _macOS_
 
 Unregisters the app from notifications received from APNS.
-
-Apps unregistered through this method can always reregister.
-
 See: https://developer.apple.com/documentation/appkit/nsapplication/1428747-unregisterforremotenotifications?language=objc

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_ _Linux_
+### `screen.screenToDipPoint(point)` _Windows_
 
 * `point` [Point](structures/point.md)
 
@@ -133,10 +133,7 @@ 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.
 
-Not currently supported on Wayland - if used there it will return the point passed
-in with no changes.
-
-### `screen.dipToScreenPoint(point)` _Windows_ _Linux_
+### `screen.dipToScreenPoint(point)` _Windows_
 
 * `point` [Point](structures/point.md)
 
@@ -145,8 +142,6 @@ 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

docs/api/session.md

@@ -971,6 +971,7 @@ session.fromPartition('some-partition').setPermissionCheckHandler((webContents,
     * `videoRequested` Boolean - true if the web content requested a video stream.
     * `audioRequested` Boolean - true if the web content requested an audio stream.
     * `userGesture` Boolean - Whether a user gesture was active when this request was triggered.
+    * `preferredDisplaySurface` String - The preferred display used for sharing screen in this request.
   * `callback` Function
     * `streams` Object
       * `video` Object | [WebFrameMain](web-frame-main.md) (optional)

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) _Linux_ _Windows_ - Auto hide the menu bar
-  unless the `Alt` key is pressed. Default is `false`.
+* `autoHideMenuBar` boolean (optional) - 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`.
@@ -93,7 +93,7 @@
     **Note:** This option is currently experimental.
 * `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjunction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
   * `color` String (optional) _Windows_ _Linux_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
-  * `symbolColor` String (optional) _Windows_ _Linux_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
+  * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
   * `height` Integer (optional) - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
 * `trafficLightPosition` [Point](point.md) (optional) _macOS_ -
   Set a custom position for the traffic light buttons in frameless windows.

docs/api/structures/input-event.md

@@ -12,6 +12,6 @@
   `pointerDown`, `pointerUp`, `pointerMove`, `pointerRawUpdate`,
   `pointerCancel` or `pointerCausedUaAction`.
 * `modifiers` string[] (optional) - An array of modifiers of the event, can
-  be `shift`, `control`, `ctrl`, `alt`, `meta`, `command`, `cmd`, `iskeypad`,
-  `isautorepeat`, `leftbuttondown`, `middlebuttondown`, `rightbuttondown`,
-  `capslock`, `numlock`, `left`, `right`.
+  be `shift`, `control`, `ctrl`, `alt`, `meta`, `command`, `cmd`, `isKeypad`,
+  `isAutoRepeat`, `leftButtonDown`, `middleButtonDown`, `rightButtonDown`,
+  `capsLock`, `numLock`, `left`, `right`.

docs/api/structures/protocol-response.md

@@ -25,8 +25,9 @@
   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.
-  The HTTP request will reuse the current session by default.
+* `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.
 * `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"`.
 

docs/api/structures/web-preferences.md

@@ -149,7 +149,6 @@
   `WebContents` when the preferred size changes. Default is `false`.
 * `transparent` boolean (optional) - Whether to enable background transparency for the guest page. Default is `true`. **Note:** The guest page's text and background colors are derived from the [color scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/color-scheme) of its root element. When transparency is enabled, the text color will still change accordingly but the background will remain transparent.
 * `enableDeprecatedPaste` boolean (optional) _Deprecated_ - Whether to enable the `paste` [execCommand](https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand). Default is `false`.
-* `enableCornerSmoothingCSS` boolean (optional) _Experimental_ - Whether the [`-electron-corner-smoothing` CSS rule](../corner-smoothing-css.md) is enabled. Default is `true`.
 
 [chrome-content-scripts]: https://developer.chrome.com/extensions/content_scripts#execution-environment
 [runtime-enabled-features]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/runtime_enabled_features.json5

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. Setting the text to an empty string will remove the tooltip.
+Sets the hover text for this tray icon.
 
 #### `tray.setTitle(title[, options])` _macOS_
 

docs/api/utility-process.md

@@ -44,8 +44,6 @@ Process: [Main](../glossary.md#main-process)<br />
 
 Returns [`UtilityProcess`](utility-process.md#class-utilityprocess)
 
-**Note:** `utilityProcess.fork` can only be called after the `ready` event has been emitted on `App`.
-
 ## Class: UtilityProcess
 
 > Instances of the `UtilityProcess` represent the Chromium spawned child process

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.toBitmap())
+  // updateBitmap(dirty, image.getBitmap())
 })
 win.loadURL('https://github.com')
 ```

docs/api/web-utils.md

@@ -16,7 +16,7 @@ Returns `string` - The file system path that this `File` object points to. In th
 
 This method superseded the previous augmentation to the `File` object with the `path` property.  An example is included below.
 
-```js @ts-nocheck
+```js
 // Before
 const oldPath = document.querySelector('input').files[0].path
 

docs/breaking-changes.md

@@ -12,7 +12,7 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
-## Planned Breaking API Changes (37.0)
+## Planned Breaking API Changes (36.0)
 
 ### Utility Process unhandled rejection behavior change
 
@@ -27,53 +27,7 @@ process.on('unhandledRejection', () => {
 })
 ```
 
-### 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.
-
-`app.commandLine` was only meant to handle chromium switches (which aren't case-sensitive) and switches passed via `app.commandLine` will not be passed down to any of the child processes.
-
-If you were using `app.commandLine` to control the behavior of the  main process, you should do this via `process.argv`.
-
-### Deprecated: `NativeImage.getBitmap()`
-
-`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`
+### Removed:`isDefault` and `status` properties on `PrinterInfo`
 
 These properties have been removed from the PrinterInfo Object
 because they have been removed from upstream Chromium.
@@ -85,16 +39,6 @@ When calling `Session.clearStorageData(options)`, the `options.quota` type
 [removed](https://chromium-review.googlesource.com/c/chromium/src/+/6309405)
 from upstream Chromium.
 
-### Deprecated: `null` value for `session` property in `ProtocolResponse`
-
-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`.
-
 ### Deprecated: `quota` property in `Session.clearStorageData(options)`
 
 When calling `Session.clearStorageData(options)`, the `options.quota`
@@ -115,24 +59,6 @@ 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

docs/fiddles/features/macos-dock-menu/main.js

@@ -24,7 +24,9 @@ const dockMenu = Menu.buildFromTemplate([
 ])
 
 app.whenReady().then(() => {
-  app.dock?.setMenu(dockMenu)
+  if (process.platform === 'darwin') {
+    app.dock.setMenu(dockMenu)
+  }
 }).then(createWindow)
 
 app.on('window-all-closed', () => {

docs/fiddles/ipc/pattern-1/main.js

@@ -1,12 +1,6 @@
 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: {
@@ -14,11 +8,16 @@ 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 () {

docs/images/corner-smoothing-example-0.svg

@@ -1,3 +0,0 @@
-<svg width="192" height="192" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 48C0 21.4903 21.4903 0 48 0H144C170.51 0 192 21.4903 192 48V144C192 170.51 170.51 192 144 192H48C21.4903 192 0 170.51 0 144V48Z" fill="#6495ED"/>
-</svg>

docs/images/corner-smoothing-example-100.svg

@@ -1,3 +0,0 @@
-<svg width="192" height="192" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 96C0 50.7452 0 28.1177 14.0589 14.0589C28.1177 0 50.7452 0 96 0C141.255 0 163.882 0 177.941 14.0589C192 28.1177 192 50.7452 192 96C192 141.255 192 163.882 177.941 177.941C163.882 192 141.255 192 96 192C50.7452 192 28.1177 192 14.0589 177.941C0 163.882 0 141.255 0 96Z" fill="#6495ED"/>
-</svg>

docs/images/corner-smoothing-example-30.svg

@@ -1,3 +0,0 @@
-<svg width="192" height="192" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 62.4C0 49.0126 0 42.3188 1.32624 36.7946C5.5399 19.2435 19.2435 5.5399 36.7946 1.32624C42.3188 0 49.0126 0 62.4 0H129.6C142.987 0 149.681 0 155.205 1.32624C172.757 5.5399 186.46 19.2435 190.674 36.7946C192 42.3188 192 49.0126 192 62.4V129.6C192 142.987 192 149.681 190.674 155.205C186.46 172.757 172.757 186.46 155.205 190.674C149.681 192 142.987 192 129.6 192H62.4C49.0126 192 42.3188 192 36.7946 190.674C19.2435 186.46 5.5399 172.757 1.32624 155.205C0 149.681 0 142.987 0 129.6V62.4Z" fill="#6495ED"/>
-</svg>

docs/images/corner-smoothing-example-60.svg

@@ -1,3 +0,0 @@
-<svg width="192" height="192" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 76.8C0 49.9175 0 36.4762 5.23169 26.2085C9.83361 17.1767 17.1767 9.83361 26.2085 5.23169C36.4762 0 49.9175 0 76.8 0H115.2C142.083 0 155.524 0 165.792 5.23169C174.823 9.83361 182.166 17.1767 186.768 26.2085C192 36.4762 192 49.9175 192 76.8V115.2C192 142.083 192 155.524 186.768 165.792C182.166 174.823 174.823 182.166 165.792 186.768C155.524 192 142.083 192 115.2 192H76.8C49.9175 192 36.4762 192 26.2085 186.768C17.1767 182.166 9.83361 174.823 5.23169 165.792C0 155.524 0 142.083 0 115.2V76.8Z" fill="#6495ED"/>
-</svg>

docs/images/corner-smoothing-summary.svg

@@ -1,15 +0,0 @@
-<svg width="1024" height="512" viewBox="0 0 1024 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1024" height="512" fill="#EEEEEE"/>
-<rect x="32" y="128" width="256" height="256" fill="white"/>
-<rect x="64" y="160" width="192" height="192" rx="48" stroke="#444444" stroke-width="4"/>
-<rect x="320" y="64" width="384" height="384" fill="white"/>
-<mask id="mask0_1_2" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="320" y="64" width="384" height="384">
-<rect x="320" y="64" width="384" height="384" fill="white"/>
-</mask>
-<g mask="url(#mask0_1_2)">
-<rect x="85" y="171" width="512" height="512" rx="128" stroke="#444444" stroke-width="8"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M340.677 167H341.323C401.39 167 446.862 167 481.984 171.722C517.284 176.468 542.726 186.05 562.338 205.662C581.95 225.274 591.532 250.716 596.278 286.016C601 321.138 601 366.61 601 426.677V427.323C601 487.39 601 532.862 596.278 567.984C591.532 603.284 581.95 628.726 562.338 648.338C542.726 667.95 517.284 677.532 481.984 682.278C446.862 687 401.39 687 341.323 687H340.677C280.61 687 235.138 687 200.016 682.278C164.716 677.532 139.274 667.95 119.662 648.338C100.05 628.726 90.4679 603.284 85.722 567.984C81 532.862 81 487.39 81 427.323V426.677C81 366.61 81 321.138 85.722 286.016C90.4679 250.716 100.05 225.274 119.662 205.662C139.274 186.05 164.716 176.468 200.016 171.722C235.138 167 280.61 167 340.677 167ZM201.082 179.651C166.67 184.277 143.197 193.441 125.319 211.319C107.441 229.197 98.2773 252.67 93.6506 287.082C89.0085 321.61 89 366.547 89 427C89 487.453 89.0085 532.39 93.6506 566.918C98.2773 601.33 107.441 624.803 125.319 642.681C143.197 660.559 166.67 669.723 201.082 674.349C235.61 678.992 280.547 679 341 679C401.453 679 446.39 678.992 480.918 674.349C515.33 669.723 538.803 660.559 556.681 642.681C574.559 624.803 583.723 601.33 588.349 566.918C592.992 532.39 593 487.453 593 427C593 366.547 592.992 321.61 588.349 287.082C583.723 252.67 574.559 229.197 556.681 211.319C538.803 193.441 515.33 184.277 480.918 179.651C446.39 175.008 401.453 175 341 175C280.547 175 235.61 175.008 201.082 179.651Z" fill="#2A90D9"/>
-</g>
-<rect x="731" y="128" width="256" height="256" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M863.839 158H864.161C886.652 158 903.732 158 916.936 159.775C930.228 161.562 939.892 165.182 947.355 172.645C954.818 180.108 958.438 189.772 960.225 203.064C962 216.268 962 233.348 962 255.839V256.161C962 278.652 962 295.732 960.225 308.936C958.438 322.228 954.818 331.892 947.355 339.355C939.892 346.818 930.228 350.438 916.936 352.225C903.732 354 886.652 354 864.161 354H863.839C841.348 354 824.268 354 811.064 352.225C797.772 350.438 788.108 346.818 780.645 339.355C773.182 331.892 769.562 322.228 767.775 308.936C766 295.732 766 278.652 766 256.161V255.839C766 233.348 766 216.268 767.775 203.064C769.562 189.772 773.182 180.108 780.645 172.645C788.108 165.182 797.772 161.562 811.064 159.775C824.268 158 841.348 158 863.839 158ZM811.597 163.74C798.748 165.467 790.069 168.877 783.473 175.473C776.877 182.069 773.467 190.748 771.74 203.597C770.004 216.504 770 233.316 770 256C770 278.684 770.004 295.496 771.74 308.403C773.467 321.252 776.877 329.931 783.473 336.527C790.069 343.123 798.748 346.533 811.597 348.26C824.504 349.996 841.316 350 864 350C886.684 350 903.496 349.996 916.403 348.26C929.252 346.533 937.931 343.123 944.527 336.527C951.123 329.931 954.533 321.252 956.26 308.403C957.996 295.496 958 278.684 958 256C958 233.316 957.996 216.504 956.26 203.597C954.533 190.748 951.123 182.069 944.527 175.473C937.931 168.877 929.252 165.467 916.403 163.74C903.496 162.004 886.684 162 864 162C841.316 162 824.504 162.004 811.597 163.74Z" fill="#2A90D9"/>
-</svg>

docs/tutorial/custom-window-styles.md

@@ -37,6 +37,7 @@ 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).

docs/tutorial/devices.md

@@ -57,7 +57,7 @@ the WebHID API:
 
 ### Blocklist
 
-By default Electron employs the same [blocklist](https://wicg.github.io/webhid/#blocklist)
+By default Electron employs the same [blocklist](https://github.com/WICG/webhid/blob/main/blocklist.txt)
 used by Chromium.  If you wish to override this behavior, you can do so by
 setting the `disable-hid-blocklist` flag:
 
@@ -104,16 +104,6 @@ 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
@@ -155,16 +145,6 @@ 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

docs/tutorial/electron-timelines.md

@@ -9,11 +9,10 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 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 | ✅ |
+| 36.0.0 |  2025-Mar-06 | 2025-Apr-02 | 2025-Apr-29 | 2025-Oct-28 | M136 | TBD | ✅ |
 | 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 | 🚫 |

docs/tutorial/macos-dock.md

@@ -50,7 +50,9 @@ const dockMenu = Menu.buildFromTemplate([
 ])
 
 app.whenReady().then(() => {
-  app.dock?.setMenu(dockMenu)
+  if (process.platform === 'darwin') {
+    app.dock.setMenu(dockMenu)
+  }
 }).then(createWindow)
 
 app.on('window-all-closed', () => {

filenames.auto.gni

@@ -14,7 +14,6 @@ auto_filenames = {
     "docs/api/content-tracing.md",
     "docs/api/context-bridge.md",
     "docs/api/cookies.md",
-    "docs/api/corner-smoothing-css.md",
     "docs/api/crash-reporter.md",
     "docs/api/debugger.md",
     "docs/api/desktop-capturer.md",

filenames.gni

@@ -35,7 +35,6 @@ 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",
@@ -126,7 +125,6 @@ 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",
@@ -455,6 +453,8 @@ filenames = {
     "shell/browser/net/system_network_context_manager.h",
     "shell/browser/net/url_loader_network_observer.cc",
     "shell/browser/net/url_loader_network_observer.h",
+    "shell/browser/net/url_pipe_loader.cc",
+    "shell/browser/net/url_pipe_loader.h",
     "shell/browser/net/web_request_api_interface.h",
     "shell/browser/network_hints_handler_impl.cc",
     "shell/browser/network_hints_handler_impl.h",
@@ -594,6 +594,8 @@ filenames = {
     "shell/common/gin_converters/callback_converter.h",
     "shell/common/gin_converters/content_converter.cc",
     "shell/common/gin_converters/content_converter.h",
+    "shell/common/gin_converters/display_surface_converter.cc",
+    "shell/common/gin_converters/display_surface_converter.h",
     "shell/common/gin_converters/file_dialog_converter.cc",
     "shell/common/gin_converters/file_dialog_converter.h",
     "shell/common/gin_converters/file_path_converter.h",
@@ -720,8 +722,6 @@ filenames = {
     "shell/renderer/electron_renderer_client.h",
     "shell/renderer/electron_sandboxed_renderer_client.cc",
     "shell/renderer/electron_sandboxed_renderer_client.h",
-    "shell/renderer/electron_smooth_round_rect.cc",
-    "shell/renderer/electron_smooth_round_rect.h",
     "shell/renderer/preload_realm_context.cc",
     "shell/renderer/preload_realm_context.h",
     "shell/renderer/preload_utils.cc",

filenames.libcxx.gni

@@ -65,7 +65,6 @@ 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",
@@ -342,6 +341,7 @@ 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,11 +361,19 @@ 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",
@@ -377,6 +385,7 @@ 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",
@@ -385,6 +394,7 @@ 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",
@@ -400,7 +410,99 @@ 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",
@@ -413,12 +515,15 @@ 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",
@@ -442,6 +547,7 @@ 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",
@@ -451,19 +557,100 @@ 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",
@@ -473,6 +660,10 @@ 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",
@@ -481,18 +672,81 @@ 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",
@@ -501,19 +755,24 @@ 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",
@@ -523,22 +782,43 @@ 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",
@@ -569,9 +849,16 @@ 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",
@@ -585,9 +872,14 @@ 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",
@@ -596,18 +888,54 @@ 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",
@@ -642,11 +970,62 @@ 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",
@@ -661,7 +1040,9 @@ 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",
@@ -673,6 +1054,7 @@ 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",
@@ -692,6 +1074,7 @@ 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",
@@ -704,10 +1087,12 @@ 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",
@@ -739,6 +1124,7 @@ 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",
@@ -798,13 +1184,18 @@ 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",
@@ -817,12 +1208,16 @@ 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",
@@ -830,6 +1225,7 @@ 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",
@@ -837,9 +1233,12 @@ 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",
@@ -858,17 +1257,36 @@ 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",
@@ -876,23 +1294,35 @@ 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",
@@ -902,14 +1332,17 @@ 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",
@@ -918,6 +1351,7 @@ 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",
@@ -956,10 +1390,6 @@ 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",
@@ -1030,14 +1460,12 @@ 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",
@@ -1131,7 +1559,6 @@ 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",
@@ -1156,7 +1583,6 @@ 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",
@@ -1206,7 +1632,6 @@ 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",
@@ -1421,6 +1846,7 @@ 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",
@@ -1462,8 +1888,6 @@ 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",
@@ -1588,7 +2012,6 @@ 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",
@@ -1612,7 +2035,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.in",
+  "//third_party/libc++/src/include/module.modulemap",
   "//third_party/libc++/src/include/mutex",
   "//third_party/libc++/src/include/new",
   "//third_party/libc++/src/include/numbers",

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);
       }
     });

lib/browser/api/desktop-capturer.ts

@@ -16,13 +16,13 @@ function isValid (options: Electron.SourcesOptions) {
 
 export { isDisplayMediaSystemPickerAvailable };
 
-export async function getSources (args: Electron.SourcesOptions) {
+export async function getSources (args: Electron.SourcesOptions, useSystemPicker: boolean = false) {
   if (!isValid(args)) throw new Error('Invalid options');
 
   const resizableValues = new Map();
   if (process.platform === 'darwin') {
     // Fix for bug in ScreenCaptureKit that modifies a window's styleMask the first time
-    // it captures a non-resizable window. We record each non-resizable window's styleMask,
+    // it captures a non-resizable window. We record each non-resizable window's styleMask
     // and we restore modified styleMasks later, after the screen capture.
     for (const win of BrowserWindow.getAllWindows()) {
       resizableValues.set([win.id], win.resizable);
@@ -32,14 +32,15 @@ export async function getSources (args: Electron.SourcesOptions) {
   const captureWindow = args.types.includes('window');
   const captureScreen = args.types.includes('screen');
 
-  const { thumbnailSize = { width: 150, height: 150 } } = args;
+  const { thumbnailSize = { width: 0, height: 0 } } = args;
   const { fetchWindowIcons = false } = args;
 
   const options = {
     captureWindow,
     captureScreen,
     thumbnailSize,
-    fetchWindowIcons
+    fetchWindowIcons,
+    useSystemPicker
   };
 
   for (const running of currentlyRunning) {
@@ -81,7 +82,7 @@ export async function getSources (args: Electron.SourcesOptions) {
       resolve(sources);
     };
 
-    capturer.startHandling(captureWindow, captureScreen, thumbnailSize, fetchWindowIcons);
+    capturer.startHandling(captureWindow, captureScreen, thumbnailSize, fetchWindowIcons, useSystemPicker);
   });
 
   currentlyRunning.push({

lib/browser/api/menu-item-roles.ts

@@ -78,9 +78,7 @@ export const roleList: Record<RoleId, Role> = {
   minimize: {
     label: 'Minimize',
     accelerator: 'CommandOrControl+M',
-    windowMethod: w => {
-      if (w.minimizable) w.minimize();
-    }
+    windowMethod: w => w.minimize()
   },
   paste: {
     label: 'Paste',

lib/browser/api/menu.ts

@@ -93,7 +93,7 @@ Menu.prototype.popup = function (options = {}) {
     }
   }
 
-  this.popupAt(window as unknown as BaseWindow, options.frame, x, y, positioningItem, sourceType, callback);
+  this.popupAt(window as unknown as BaseWindow, x, y, positioningItem, sourceType, callback);
   return { browserWindow: window, x, y, position: positioningItem };
 };
 

lib/browser/api/session.ts

@@ -2,25 +2,61 @@ import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
 import { addIpcDispatchListeners } from '@electron/internal/browser/ipc-dispatch';
 import * as deprecate from '@electron/internal/common/deprecate';
 
-import { net } from 'electron/main';
+import { desktopCapturer, net } from 'electron/main';
 
 const { fromPartition, fromPath, Session } = process._linkedBinding('electron_browser_session');
 const { isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
 
-// Fake video window that activates the native system picker
-// This is used to get around the need for a screen/window
-// id in Chrome's desktopCapturer.
-let fakeVideoWindowId = -1;
-// See content/public/browser/desktop_media_id.h
-const kMacOsNativePickerId = -4;
-const systemPickerVideoSource = Object.create(null);
-Object.defineProperty(systemPickerVideoSource, 'id', {
-  get () {
-    return `window:${kMacOsNativePickerId}:${fakeVideoWindowId--}`;
+async function getNativePickerSource (preferredDisplaySurface: string) {
+  console.log('SESSION.TS getNativePickerSource');
+  // Fake video window that activates the native system picker
+  // This is used to get around the need for a screen/window
+  // id in Chrome's desktopCapturer.
+  // let fakeVideoWindowId = -1;
+  // const kMacOsNativePickerId = -4;
+
+  if (process.platform !== 'darwin') {
+    throw new Error('Native system picker option is currently only supported on MacOS');
   }
-});
-systemPickerVideoSource.name = '';
-Object.freeze(systemPickerVideoSource);
+
+  if (!isDisplayMediaSystemPickerAvailable) {
+    throw new Error(`Native system picker unavailable. 
+      Note: This is an experimental API; please check the API documentation for updated restrictions`);
+  }
+
+  let types: Electron.SourcesOptions['types'];
+  switch (preferredDisplaySurface) {
+    case 'no_preference':
+      types = ['screen', 'window'];
+      break;
+    case 'monitor':
+      types = ['screen'];
+      break;
+    case 'window':
+      types = ['window'];
+      break;
+    default:
+      types = ['screen', 'window'];
+  }
+
+  // Pass in the needed options for a more native experience
+  // screen & windows by default, no thumbnails, since the native picker doesn't return them
+  const options: Electron.SourcesOptions = {
+    types,
+    thumbnailSize: { width: 0, height: 0 },
+    fetchWindowIcons: false
+  };
+
+  const mediaStreams = await desktopCapturer.getSources(options);
+
+  if (mediaStreams.length === 0) {
+    throw new Error('No media streams found');
+  }
+
+  // mediaStreams[0].id = `none:${kMacOsNativePickerId}:${fakeVideoWindowId--}`;
+  console.log('SESSION.TS mediaStreams', mediaStreams);
+  return mediaStreams[0];
+}
 
 Session.prototype._init = function () {
   addIpcDispatchListeners(this);
@@ -48,12 +84,12 @@ Session.prototype.fetch = function (input: RequestInfo, init?: RequestInit) {
 Session.prototype.setDisplayMediaRequestHandler = function (handler, opts) {
   if (!handler) return this._setDisplayMediaRequestHandler(handler, opts);
 
-  this._setDisplayMediaRequestHandler(async (req, callback) => {
+  this._setDisplayMediaRequestHandler(async (request, callback) => {
     if (opts && opts.useSystemPicker && isDisplayMediaSystemPickerAvailable()) {
-      return callback({ video: systemPickerVideoSource });
+      return callback({ video: await getNativePickerSource(request.preferredDisplaySurface) });
     }
 
-    return handler(req, callback);
+    // return handler(request, callback);
   }, opts);
 };
 

lib/browser/api/web-contents.ts

@@ -263,17 +263,8 @@ WebContents.prototype.print = function (options: ElectronInternal.WebContentsPri
     throw new TypeError('webContents.print(): Invalid print settings specified.');
   }
 
-  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') {
+  const pageSize = options.pageSize ?? 'A4';
+  if (typeof pageSize === 'object') {
     if (!pageSize.height || !pageSize.width) {
       throw new Error('height and width properties are required for pageSize');
     }
@@ -295,7 +286,16 @@ WebContents.prototype.print = function (options: ElectronInternal.WebContentsPri
       imageable_area_right_microns: width,
       imageable_area_top_microns: height
     };
-  } else if (pageSize !== undefined) {
+  } 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 {
     throw new Error(`Unsupported pageSize: ${pageSize}`);
   }
 

lib/browser/init.ts

@@ -218,6 +218,7 @@ 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 {

lib/node/asar-fs-wrapper.ts

@@ -667,10 +667,10 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     return p(pathArgument, options);
   };
 
-  function readFileFromArchiveSync (
-    pathInfo: { asarPath: string; filePath: string },
-    options: any
-  ): ReturnType<typeof readFileSync> {
+  const { readFileSync } = fs;
+  fs.readFileSync = function (pathArgument: string, options: any) {
+    const pathInfo = splitPath(pathArgument);
+    if (!pathInfo.isAsar) return readFileSync.apply(this, arguments);
     const { asarPath, filePath } = pathInfo;
 
     const archive = getOrCreateArchive(asarPath);
@@ -704,14 +704,6 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     fs.readSync(fd, buffer, 0, info.size, info.offset);
     validateBufferIntegrity(buffer, info.integrity);
     return (encoding) ? buffer.toString(encoding) : buffer;
-  }
-
-  const { readFileSync } = fs;
-  fs.readFileSync = function (pathArgument: string, options: any) {
-    const pathInfo = splitPath(pathArgument);
-    if (!pathInfo.isAsar) return readFileSync.apply(this, arguments);
-
-    return readFileFromArchiveSync(pathInfo, options);
   };
 
   type ReaddirOptions = { encoding: BufferEncoding | null; withFileTypes?: false, recursive?: false } | undefined | null;
@@ -988,19 +980,25 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   };
 
   const modBinding = internalBinding('modules');
-  modBinding.overrideReadFileSync((jsonPath: string): Buffer | false | undefined => {
+  const { readPackageJSON } = modBinding;
+  internalBinding('modules').readPackageJSON = (
+    jsonPath: string,
+    isESM: boolean,
+    base: undefined | string,
+    specifier: undefined | string
+  ) => {
     const pathInfo = splitPath(jsonPath);
+    if (!pathInfo.isAsar) return readPackageJSON(jsonPath, isESM, base, specifier);
+    const { asarPath, filePath } = pathInfo;
 
-    // Fallback to Node.js internal implementation
-    if (!pathInfo.isAsar) return undefined;
+    const archive = getOrCreateArchive(asarPath);
+    if (!archive) return undefined;
 
-    try {
-      return readFileFromArchiveSync(pathInfo, undefined);
-    } catch {
-      // Not found
-      return false;
-    }
-  });
+    const realPath = archive.copyFileOut(filePath);
+    if (!realPath) return undefined;
+
+    return readPackageJSON(realPath, isESM, base, specifier);
+  };
 
   const { internalModuleStat } = binding;
   internalBinding('fs').internalModuleStat = (receiver: unknown, pathArgument: string) => {

package.json

@@ -10,7 +10,7 @@
     "@electron/fiddle-core": "^1.3.4",
     "@electron/github-app-auth": "^2.2.1",
     "@electron/lint-roller": "^2.4.0",
-    "@electron/typescript-definitions": "^9.1.2",
+    "@electron/typescript-definitions": "^9.0.0",
     "@octokit/rest": "^20.0.2",
     "@primer/octicons": "^10.0.0",
     "@types/minimist": "^1.2.5",

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 4cbfa1f53bb669c24c7f055f4fee7f144f72115a..120cb84e07e0539c038bca059b794d8f9f932a51 100644
+index f68ede9156ee57526f4578953c350798a1299f00..1de18075e1cfa7f9660fa3b065cd20bafcbe7ee8 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 6abab7693ef2cf418e64d4bf5d53e7e0821cb731..ecbf81be6888cf2e95008da054cf4d3d7df6ad49 100644
+index 5ddc2d3b4cfb8a87eb22fb707230f56dcb7ccb3e..dea3c5b3adf49e1b4aab197e822744c80964afac 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
 @@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);

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 13e68ad20ac08a462bb577d7f99e2c6f167579fa..4960d0eeb8f31bec4347ed2a1b63beba530de700 100644
+index 6bb135801326bc1cbe2b93f02e561e38c90abeca..06bcba4451456c72b168266859482343af76a931 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);

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 69f3fe2f5c193a30dd90368048804109db563da3..52393736adee2d50de218ac86c9e7cbcd9d6bf6d 100644
+index 10b062abf8304df32652c57f377d57209bb47ed1..4eefe928daaf959d0cb1f0820e01ee05754bb4d5 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
-@@ -1204,7 +1204,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
+@@ -1206,7 +1206,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
    }
  
    if (ret_code == 0) {
@@ -32,7 +32,7 @@ index 69f3fe2f5c193a30dd90368048804109db563da3..52393736adee2d50de218ac86c9e7cbc
        return SSL_ERROR_ZERO_RETURN;
      }
      // An EOF was observed which violates the protocol, and the underlying
-@@ -2571,13 +2571,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
+@@ -2573,13 +2573,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
    return CRYPTO_get_ex_data(&ctx->ex_data, idx);
  }
  

patches/chromium/.patches

@@ -128,21 +128,19 @@ chore_remove_reference_to_chrome_browser_themes.patch
 feat_enable_customizing_symbol_color_in_framecaptionbutton.patch
 build_allow_electron_mojom_interfaces_to_depend_on_blink.patch
 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_adjust_headless_mode_handling_in_native_widget.patch
+fix_add_method_which_disables_headless_mode_on_native_widget.patch
 refactor_unfilter_unresponsive_events.patch
 build_disable_thin_lto_mac.patch
-feat_corner_smoothing_css_rule_and_blink_painting.patch
 build_add_public_config_simdutf_config.patch
-fix_multiple_scopedpumpmessagesinprivatemodes_instances.patch
 revert_code_health_clean_up_stale_macwebcontentsocclusion.patch
-ignore_parse_errors_for_resolveshortcutproperties.patch
+ignore_parse_errors_for_pkey_appusermodel_toastactivatorclsid.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
 fix_enable_wrap_iter_in_string_view_and_array.patch
 fix_linter_error.patch
-chore_grandfather_in_electron_views_and_delegates.patch
-refactor_patch_electron_permissiontypes_into_blink.patch
+fix_take_snapped_status_into_account_when_showing_a_window.patch
+feat_make_macos_sccontentsharingpicker_work_in_electron_and_return_screen_window_or_both.patch
+fix_debug_desktop_capturer_picture.patch

patches/chromium/accelerator.patch

@@ -5,11 +5,12 @@ Subject: fix: improve shortcut text of Accelerator
 
 This patch makes three changes to Accelerator::GetShortcutText to improve shortcut display text in menus:
 
-1. F2-F24 accelerators show up as such
-2. Ctrl-Shift-= and Ctrl-Plus show up as such
+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
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 5ad9332dd27ceda7d67cd3f571b12218a4415a40..ffe083836c39fb60b4bff1f9fbdd6cebb7fa9d1d 100644
+index 5590f9d425229d87373c5b53651d2e2d17b779e4..407cbd7e7811e3053e35e26f24e3c049cdd59a46 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -12,6 +12,7 @@
@@ -20,51 +21,51 @@ index 5ad9332dd27ceda7d67cd3f571b12218a4415a40..ffe083836c39fb60b4bff1f9fbdd6ceb
  #include "base/strings/utf_string_conversions.h"
  #include "base/types/cxx23_to_underlying.h"
  #include "build/build_config.h"
-@@ -164,6 +165,11 @@ std::u16string Accelerator::GetKeyCodeStringForShortcut() const {
+@@ -109,6 +110,11 @@ std::u16string Accelerator::GetShortcutText() const {
  #endif
  
-   if (key_string.empty()) {
+   if (shortcut.empty()) {
 +    // When a shifted char is explicitly specified, for example Ctrl+Plus,
 +    // use the shifted char directly.
 +    if (shifted_char) {
-+      key_string += *shifted_char;
++      shortcut += *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
-@@ -190,6 +196,10 @@ std::u16string Accelerator::GetKeyCodeStringForShortcut() const {
+@@ -133,6 +139,10 @@ std::u16string Accelerator::GetShortcutText() const {
+       shortcut +=
            static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
-     }
  #endif
 +    }
 +    if (key_code_ > VKEY_F1 && key_code_ <= VKEY_F24)
-+      key_string = base::UTF8ToUTF16(
++      shortcut = base::UTF8ToUTF16(
 +          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
    }
  
-   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 BUILDFLAG(IS_MAC)
+@@ -317,7 +327,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+     const std::u16string& shortcut) const {
+   std::u16string result = shortcut;
  
 -  if (IsShiftDown()) {
 +  if (!shifted_char && IsShiftDown()) {
-     modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_SHIFT_KEY));
+     result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
    }
  
 diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
-index e7d5adfac920c97df8bab9bf4ed69a835ee314a9..9aeea7cb4c48d1ccc27304fa99238151b2811c87 100644
+index 198c7469f410d3516b8a18493c5e4588d02487c2..e4995824ae2f3bb8045a3841a6213a4b315845a8 100644
 --- a/ui/base/accelerators/accelerator.h
 +++ b/ui/base/accelerators/accelerator.h
 @@ -18,6 +18,7 @@
- #include <vector>
+ #include <utility>
  
  #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"
-@@ -189,6 +190,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
+@@ -185,6 +186,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
      return interrupted_by_mouse_event_;
    }
  
@@ -72,4 +73,4 @@ index e7d5adfac920c97df8bab9bf4ed69a835ee314a9..9aeea7cb4c48d1ccc27304fa99238151
 +
   private:
    friend class AcceleratorTestMac;
-   std::vector<std::u16string> GetLongFormModifiers() const;
+   std::u16string ApplyLongFormModifiers(const std::u16string& shortcut) const;

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 cadb96febde3fb3fe90929873b1db452a6d8fb8f..09f5504127b5a5ec3d0d69d9eb6d0cd93e0e75cd 100644
+index 0d8bb93bf146c3058a30693673f0c23fdea90ae8..55f76337a445345c06531ce05e603db30daf759f 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -254,6 +254,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -268,6 +268,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index cadb96febde3fb3fe90929873b1db452a6d8fb8f..09f5504127b5a5ec3d0d69d9eb6d0cd9
    // 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
-@@ -363,7 +367,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -378,7 +382,6 @@ int GpuMain(MainFunctionParams parameters) {
  #endif
    const bool dead_on_arrival = !init_success;
  

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 db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c96921d400 100644
+index 44da0544b778d6ff4c14b6f4e8463cb8260d2f0d..8ae8939af4141a684b7a6d50a43e1abb354ea028 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 db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c9
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index b0aa018f2f4e6865915516ab6b65fac20d9e6f20..c04a544eb8991bfa718322e6e3a090ef4733a50b 100644
+index 0fb92081a1bbfb14c0ddd74dfe91f94bb2be1d2a..886f677564084d8b6af15b03403cfa56aeddd3c9 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4802,6 +4802,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index b0aa018f2f4e6865915516ab6b65fac20d9e6f20..c04a544eb8991bfa718322e6e3a090ef
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index a7383e4a5ccb8ca1de10bc3efb3043f1dbbf2f6f..41075015aa2dd347c9847072dd76f9cea9ad2d94 100644
+index bf073c9180d47243f09fdd052a43dfe7e34aa4aa..d1642b675e474568c302553a288253b639ed1efd 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -652,6 +652,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -653,6 +653,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 a7383e4a5ccb8ca1de10bc3efb3043f1dbbf2f6f..41075015aa2dd347c9847072dd76f9ce
                                  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 f59582f677806c07381bc608f9cca84a7af51a2b..174113297c8e5a5928c1d9166c417cb6328cfc82 100644
+index 038c13c1e697d4f21160e0329f659b609802ecc1..60fd9aa69a86c32abf79ef8737e810b0017e1083 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -661,6 +661,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -664,6 +664,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 e52a535450964b0938b66f7506225fda0cde04a2..841e9b36df4c32040d2b3c71514266fc330c99c7 100644
+index 8bb6b0465069529f79aaec21792e8b159535b3e9..f9782531c639d07002dda07732750a0007109468 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -299,6 +299,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index e52a535450964b0938b66f7506225fda0cde04a2..841e9b36df4c32040d2b3c71514266fc
                                          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 479dd8a7294ca6f0abb72350cc1a6c61e09c7c27..45226050aea1036f2c3a2fc15cabee893d12b1a7 100644
+index 66cc44003157657c68e90d295f877789395eca8d..19cd8460711d5d5b1b76c9e4cb82ed7fc71b410c 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 479dd8a7294ca6f0abb72350cc1a6c61e09c7c27..45226050aea1036f2c3a2fc15cabee89
      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 5dbc9c1f5f45c8753dd5510ffad2c5d4c20c814b..4223ba0db6c267a4574ab4a76c5a6f365223416c 100644
+index 4c7375a27a22f04694e14fecc17d633734d4cccc..ea2a32b151aaf07b5704e463d01714eb41680afb 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 5dbc9c1f5f45c8753dd5510ffad2c5d4c20c814b..4223ba0db6c267a4574ab4a76c5a6f36
                                  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 069ccf925bc0c6f1a5b707670cc3c931dd2a25a9..49ccc167276ed544c800483c4a8655b254304ee8 100644
+index 8ca461c8fc3f2e508be5783406b570062ccf5de0..3c67d214ecd2b3b2f3e8955836e8ef7c0f0a525d 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -418,6 +418,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -416,6 +416,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}

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 b0807ee3d8ebcf34f0d740362aa46c8631562d38..118d200b74953c0068ad59300ccc0e3041d77a10 100755
+index 12ad657f5df3ff4af2bdbd8b9fb7959131db2970..f2b03596dd5ff96236272b6348336515df85eef0 100755
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -337,6 +337,31 @@ SPECIAL_CASES = {
+@@ -336,6 +336,31 @@ SPECIAL_CASES = {
          "License": "Apache 2.0",
          "License File": ["//third_party/dawn/third_party/khronos/LICENSE"],
      },

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 8064a2c27d747d4862503526496a65987df7dc35..c92596713c6d3884be3f63bf78d9117b7ad3ec90 100644
+index fd162a607424bd4d0b324ccc7270522eb3b6a991..df1d5564a52ef67b447bbc222ceb1f864eb3dd81 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
-@@ -237,6 +237,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
+@@ -230,6 +230,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
    }
  }
  
@@ -29,7 +29,7 @@ index 8064a2c27d747d4862503526496a65987df7dc35..c92596713c6d3884be3f63bf78d9117b
    objects_.clear();
    raw_objects_.clear();
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-index 939a99b2a086d5373f82fe96da73dabe02f6f9d8..fccc200b1b11076c8fcffde071a53598ffba9a12 100644
+index d8fd611e88c22f2c1319da769dcd14cc218f9c90..f17304e1e9fd202dc4e1b7724031dc4c333a4baf 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 {

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 ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793477c6d19 100644
+index 230c9cb619498f315fc0913da54837b725fc9024..0fa1120ab952864e53085e7746608bb491ec14b2 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 ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/accessibility/ax_updates_and_events.h"
  #include "ui/accessibility/platform/ax_platform_node.h"
-@@ -169,7 +170,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
+@@ -171,7 +172,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
                                 rvh->GetRoutingID(), accessibility_mode);
  }
  
@@ -30,17 +30,17 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
  base::Value::Dict BuildTargetDescriptor(Browser* browser) {
    base::Value::Dict target_data;
    target_data.Set(kSessionIdField, browser->session_id().id());
-@@ -193,7 +194,7 @@ void HandleAccessibilityRequestCallback(
-   auto& browser_accessibility_state =
-       *content::BrowserAccessibilityState::GetInstance();
+@@ -192,7 +193,7 @@ void HandleAccessibilityRequestCallback(
+   DCHECK(ShouldHandleAccessibilityRequestCallback(path));
+ 
    base::Value::Dict data;
 -  PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
 +  PrefService* pref = static_cast<electron::ElectronBrowserContext*>(current_context)->prefs();
-   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)));
+   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);
  
    std::string pref_api_type =
 -      pref->GetString(prefs::kShownAccessibilityApiType);
@@ -48,7 +48,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
    bool pref_api_type_supported = false;
  
    std::vector<ui::AXApiType::Type> supported_api_types =
-@@ -314,11 +315,11 @@ void HandleAccessibilityRequestCallback(
+@@ -288,11 +289,11 @@ void HandleAccessibilityRequestCallback(
    data.Set(kPagesField, std::move(page_list));
  
    base::Value::List browser_list;
@@ -62,7 +62,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
    data.Set(kBrowsersField, std::move(browser_list));
  
    std::string json_string;
-@@ -792,7 +793,8 @@ void AccessibilityUIMessageHandler::SetGlobalString(
+@@ -762,7 +763,8 @@ void AccessibilityUIMessageHandler::SetGlobalString(
    const std::string value = CheckJSValue(data.FindString(kValueField));
  
    if (string_name == kApiTypeField) {
@@ -72,7 +72,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
      pref->SetString(prefs::kShownAccessibilityApiType, value);
    }
  }
-@@ -846,7 +848,8 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -816,7 +818,8 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -82,7 +82,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
    ui::AXApiType::Type api_type =
        ui::AXApiType::From(pref->GetString(prefs::kShownAccessibilityApiType));
    std::string accessibility_contents =
-@@ -873,6 +876,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -843,6 +846,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -90,7 +90,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
    for (Browser* browser : *BrowserList::GetInstance()) {
      if (browser->session_id().id() == session_id) {
        base::Value::Dict result = BuildTargetDescriptor(browser);
-@@ -885,6 +889,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -855,6 +859,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
        return;
      }
    }
@@ -98,7 +98,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
  #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
    base::Value::Dict result;
-@@ -928,11 +933,13 @@ void AccessibilityUIMessageHandler::StopRecording(
+@@ -898,11 +903,13 @@ void AccessibilityUIMessageHandler::StopRecording(
  }
  
  ui::AXApiType::Type AccessibilityUIMessageHandler::GetRecordingApiType() {
@@ -115,7 +115,7 @@ index ce3840087d3becac116e57ed8c690b73e360f95f..a929b2d4f6c4b34f9e278aada9f8f793
    // 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()) {
-@@ -1002,8 +1009,11 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+@@ -972,8 +979,11 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  // static
  void AccessibilityUIMessageHandler::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {

patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -6,7 +6,7 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
-index f9b27264f7e3e1f8de6f088ccb78e4a4693c5e93..85aebec5028fd6b324a1f1d9416fbf99c150e09a 100644
+index 6c679ef877067297ec3bf1a23af6c03a2af8dcf5..1ac93433189580c13b69cd52ce62681a8620da3d 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 {
@@ -23,10 +23,10 @@ index f9b27264f7e3e1f8de6f088ccb78e4a4693c5e93..85aebec5028fd6b324a1f1d9416fbf99
      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 9d430ebff1067323f229c3b81b18300e8cb7e8a9..090125bc5a4c485c83d9eaa6b82ed5cf3402cbbd 100644
+index 6c1e46e58d975137eee6c0fd7b01d2ae970a2e10..5ca29616369e76e298eb03188e18ca545c76a162 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -768,6 +768,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -765,6 +765,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 d719b546b8c3c59003698b26dead065da7d76341..95a52f1cc2024e4a9cd694429d5304a5860a1c1e 100644
+index 19d2df47b0c929558ac8cfc208742dfef463a68b..7e9f2e71f08c1324a805462064d4fa485041c19f 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) {
@@ -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 1af1fa035b3da8967526d704e362ddbc5c3194ac..f470ada1bf84938427fb89f4508e5f56aaeebc1f 100644
+index 3de7e34536eceb241de943908875a9c3e5e99f7e..10c3795839969bde6a747da67d5cc7caa44a7179 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -2466,6 +2466,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
+@@ -2461,6 +2461,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
    TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
                 "old_state", old_state, "new_state", new_state);
  
@@ -130,7 +130,7 @@ index 1af1fa035b3da8967526d704e362ddbc5c3194ac..f470ada1bf84938427fb89f4508e5f56
    bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
                              !old_state->is_in_back_forward_cache;
    bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
-@@ -3989,10 +3993,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3987,10 +3991,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  

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 009f3563df63bc2ba2eadeecaea4f328d6a409ec..769ff8faaddf543fba1a41aff939f23741127247 100644
+index 2494aeb1cd363c07e1b662743b1453da646fe17d..927dce4724263b45ff27b046ef024ae2a04706a9 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
-@@ -150,6 +150,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -148,6 +148,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 009f3563df63bc2ba2eadeecaea4f328d6a409ec..769ff8faaddf543fba1a41aff939f237
    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 85f312a9ea1eca0ff7ba4c679fabb3156aabbc0b..a9dc007a93003610d68e3118b4a47a86d4e16f6e 100644
+index b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd715fdf82d4 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 85f312a9ea1eca0ff7ba4c679fabb3156aabbc0b..a9dc007a93003610d68e3118b4a47a86
  #include "build/build_config.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -451,6 +452,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
-   // WebView and by `kWebPayments` feature flag everywhere.
-   bool payment_request_enabled = false;
+@@ -447,6 +448,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+   // when feature DynamicSafeAreaInsets is enabled.
+   bool dynamic_safe_area_insets_enabled = false;
  
 +  // Begin Electron-specific WebPreferences.
 +  bool context_isolation = false;
@@ -65,7 +65,7 @@ index 85f312a9ea1eca0ff7ba4c679fabb3156aabbc0b..a9dc007a93003610d68e3118b4a47a86
    // 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 1173ace39b6256edc188a4c6649e7cd4c4484899..c1d53122af52f7785a016f6fc62d9aa684a4be8c 100644
+index d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b220554b0c4 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 1173ace39b6256edc188a4c6649e7cd4c4484899..c1d53122af52f7785a016f6fc62d9aa6
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -442,6 +443,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -437,6 +438,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.stylus_handwriting_enabled;
    }
  
@@ -130,7 +130,7 @@ index 1173ace39b6256edc188a4c6649e7cd4c4484899..c1d53122af52f7785a016f6fc62d9aa6
      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 ffd46eb579c7c6bf9263b02e9bbe0dee013ac76d..be40f76fae9653e8d3fdcfa74979089d3d317533 100644
+index 6678fc10d72e6c49ba729d5f44626f9a29934a3b..57f8c71bd0e3b1e09510184888636004a949c192 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 ffd46eb579c7c6bf9263b02e9bbe0dee013ac76d..be40f76fae9653e8d3fdcfa74979089d
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
    kPointerFirstType                         = kPointerNone,
-@@ -219,6 +221,19 @@ struct WebPreferences {
+@@ -218,6 +220,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;

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 2072f6b14289b1f3a76dbccc98f29aa178c1c35c..d7017437a7e7e6ac130677e52731d0482bf20664 100644
+index 9dc450bc20744463c8898bc822a558be38486493..576421cb9600625ad8b9eda25cb99954092a7a37 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 2072f6b14289b1f3a76dbccc98f29aa178c1c35c..d7017437a7e7e6ac130677e52731d048
    // 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 a309befcbcb1e7fe667bc1d794141fb90fea1035..dd148eb3cce762d20e9117b4f8030c881057b8bb 100644
+index ba6aac34b4838efa86c01926759871a31a3b2257..99ae1320be10ac19d204edfe1c1cf4f52c62eb76 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -753,10 +753,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -748,10 +748,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index a309befcbcb1e7fe667bc1d794141fb90fea1035..dd148eb3cce762d20e9117b4f8030c88
    if (!Client())
      return false;
  
-@@ -810,6 +806,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -805,6 +801,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  

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 b962901a7db8e6e50155dabbb1371124b12f9b26..b01e197ae2e411a376ffa28b9058d62a16abf23b 100644
+index 12b2fb63dd3ff8c3d29d915a7d0f84a9d26c6e0a..c9fd2c069473b1c21ca8610afb246337c412e0be 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 +

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 e9f891a025771899ffc888ea0095200342e48558..39d6f580c0cb5a0de41f32e9d7e103e05cefd0f0 100644
+index 45c518185da68419e0f482acba359f02c2152f88..a0e35f118f0b1f767b41676d651a575e8b5fddb4 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -102,6 +102,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
+@@ -91,6 +91,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
      perfetto::Category("drm"),
      perfetto::Category("drmcursor"),
      perfetto::Category("dwrite"),

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 5fbce38841f04dad38f202f529ae84c609c6a8de..9f5ef9bceade8e30bbd2be616b9143e9708fefd8 100644
+index d88fe7e43ac2a8129702e58bd2cd2aea094452e3..3cbeb89587f37b0ebc3622258fea0161ebf1d7b2 100644
 --- a/third_party/simdutf/BUILD.gn
 +++ b/third_party/simdutf/BUILD.gn
 @@ -6,9 +6,14 @@ source_set("header") {

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 35fc76646e912075c744b48b5ddec73f885ea5e8..6ce2825bf558d5f50b9df45227284103375aa2e4 100644
+index 55921115094f7437ce10db1cac1debe9adc10ea9..7040d83af340f052f5cab4437433e3dd0a688390 100644
 --- a/content/public/common/BUILD.gn
 +++ b/content/public/common/BUILD.gn
-@@ -381,6 +381,8 @@ mojom("interfaces") {
+@@ -379,6 +379,8 @@ mojom("interfaces") {
      "//content/common/*",
      "//extensions/common:mojom",
      "//extensions/common:mojom_blink",

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 ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..0ed56526002b12deb6d29f3dd23a0d74d8e7473c 100644
+index 3f6571828197301361ebde2e19e8e3138597c276..9effa81a564c3d2afae3eb2bb7438635e45f124a 100644
 --- a/.gn
 +++ b/.gn
-@@ -167,4 +167,27 @@ exec_script_allowlist =
+@@ -172,4 +172,26 @@ exec_script_allowlist =
  
        "//tools/grit/grit_rule.gni",
        "//tools/gritsettings/BUILD.gn",
@@ -34,6 +34,5 @@ index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..0ed56526002b12deb6d29f3dd23a0d74
 +      "//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",
      ]

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 a47aa1cf4fb55c91908e15f1c406d79a48697cf8..a05a20229749e032e6d26d87177aebc4955ce081 100644
+index 5b98b4aedab5b700d21d6a8eac11c81cc13f6b39..8ee6f54f67c300a52074f33f9d6fe08a68e3be4b 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
 @@ -79,7 +79,7 @@ declare_args() {

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 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b47749874 100644
+index b38442f018b218944c7b85c9f8bd8b8eb6137b9e..dd15f6cf5dc40f2d54134c833d35508f2e22967b 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
+@@ -199,11 +199,16 @@ if (!is_android && !is_mac) {
          "common/crash_keys.h",
        ]
  
@@ -33,10 +33,10 @@ index 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index ae32014a8a25f3b1de7f6087551a87400e1463b5..be77c4e02cc495194ed6b248e56bcb75abe4efce 100644
+index 0ad542897fa8e45003a7945d9393f84844f993d3..0fb8770c97c2a3c2ffebb558cd81081821747b2a 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4627,7 +4627,7 @@ static_library("browser") {
+@@ -4567,7 +4567,7 @@ static_library("browser") {
            [ "//chrome/browser/ui/webui/signin:profile_impl" ]
      }
  
@@ -46,10 +46,10 @@ index ae32014a8a25f3b1de7f6087551a87400e1463b5..be77c4e02cc495194ed6b248e56bcb75
        # than here in :chrome_dll.
        deps += [ "//chrome:packed_resources_integrity_header" ]
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index e08035df314884fab39562cd9ee4960ec5af3cb5..28f0f4d671e16ffff770b43fa5a2e366491d4b30 100644
+index 1cc7b3905eae8d1c3025ae3454482ea8418a5217..bf71a7514f337cc6447e27a8ebd3a2c299840121 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7185,9 +7185,12 @@ test("unit_tests") {
+@@ -7031,9 +7031,12 @@ test("unit_tests") {
        "//chrome/notification_helper",
      ]
  
@@ -63,7 +63,7 @@ index e08035df314884fab39562cd9ee4960ec5af3cb5..28f0f4d671e16ffff770b43fa5a2e366
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -8153,6 +8156,10 @@ test("unit_tests") {
+@@ -7996,6 +7999,10 @@ test("unit_tests") {
        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
      ]
  
@@ -74,7 +74,7 @@ index e08035df314884fab39562cd9ee4960ec5af3cb5..28f0f4d671e16ffff770b43fa5a2e366
      sources += [
        # The importer code is not used on Android.
        "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8208,7 +8215,6 @@ test("unit_tests") {
+@@ -8051,7 +8058,6 @@ test("unit_tests") {
      # Non-android deps for "unit_tests" target.
      deps += [
        "../browser/screen_ai:screen_ai_install_state",

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 c3a3bf4970783804bc76ee4e71bb8233b5f215a8..78c72710b411e05ca0b6f01811076599fa66fc15 100644
+index bdf8b13631a3cdf698078f70c435e9316cf0bfc3..53df468e94bdd2cdf049604e29e55863efdd3a8d 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -123,6 +123,9 @@ if (current_os == "") {

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 f411f2d51a397db52ba28eb7ed430f6f16c5396d..219e99e56cbf35aac8e18cff96601143f9f44ebf 100644
+index 3f437d2b9c193285bdc200c2781b13de75ba993d..d9493066ddc7d7198acc76f345c726be021d8fce 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
-@@ -295,7 +295,11 @@ libcxx_modules("std_wctype_h") {
+@@ -204,7 +204,11 @@ libcxx_modules("std_wctype_h") {
  if (libcxx_is_shared) {
    _libcxx_target_type = "shared_library"
  } else {
@@ -23,7 +23,7 @@ index f411f2d51a397db52ba28eb7ed430f6f16c5396d..219e99e56cbf35aac8e18cff96601143
  }
  
  target(_libcxx_target_type, "libc++") {
-@@ -304,6 +308,7 @@ target(_libcxx_target_type, "libc++") {
+@@ -213,6 +217,7 @@ target(_libcxx_target_type, "libc++") {
    # need to explicitly depend on libc++.
    visibility = [
      "//build/config:common_deps",

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 9d5452597f64906ac1d3223ca5290776df8809c5..46ddad111b2feb5cc1064a1eeb424800d2cba6c1 100644
+index 447c0ae162f45eb157008e62cbc756d6f23e4920..27db5dbfd05106788feda9daab9d1aaaf1ae920f 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -9777,6 +9777,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -9635,6 +9635,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 9d5452597f64906ac1d3223ca5290776df8809c5..46ddad111b2feb5cc1064a1eeb424800
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367e48b1b63 100644
+index c53ab4b96a16b7326dfde14452b20d2170aecf04..e500fe77f55836b3e5832536f98cf9581984b8c1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5132,6 +5132,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5061,6 +5061,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
                                                 opener);
  
@@ -37,7 +37,7 @@ index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367
    // 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
-@@ -5173,12 +5179,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5102,12 +5108,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -51,10 +51,10 @@ index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367
                               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 55bb4ae3bab4cdf20b3e1dde9450a5c0e4e62b37..fe444c7fa140166a1b65c7a8a2676e2de7c4e0fc 100644
+index 8f8f79733c956fed2469e51993bad29689c11d8a..17e953f46d479f431fa06d28857901cb844ff4ea 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -646,6 +646,10 @@ struct CreateNewWindowParams {
+@@ -642,6 +642,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 55bb4ae3bab4cdf20b3e1dde9450a5c0e4e62b37..fe444c7fa140166a1b65c7a8a2676e2d
  
  // 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 210e5ffc0da31cc0d214e8a3e65f7d8b045fd33e..237b279eeefe5b18402a7dea8d1c00072655ed22 100644
+index f5b028759f86f382230867e6abf72a82051c02c3..f1110385258f057be3b456198b46e4d2c54ca718 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -823,6 +823,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -815,6 +815,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -79,10 +79,10 @@ index 210e5ffc0da31cc0d214e8a3e65f7d8b045fd33e..237b279eeefe5b18402a7dea8d1c0007
      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 be551d7a09330edf4a204b181acb382c2c3d13f4..5ed4df05dd22cbf901ecbbcc9d892de806c93890 100644
+index 1c7e6dc3b867c0e598f8517591ffb9aa8007bfea..7459b083156d1f6bc01198690c4c9ec02d88d862 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -199,6 +199,7 @@ class NetworkService;
+@@ -198,6 +198,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -90,7 +90,7 @@ index be551d7a09330edf4a204b181acb382c2c3d13f4..5ed4df05dd22cbf901ecbbcc9d892de8
  }  // namespace network
  
  namespace sandbox {
-@@ -1379,6 +1380,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1368,6 +1369,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -100,7 +100,7 @@ index be551d7a09330edf4a204b181acb382c2c3d13f4..5ed4df05dd22cbf901ecbbcc9d892de8
        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 b390356721fa226c348923f33601c4a1a2d9702d..97a3ea6f292563a41fd41f812ac72526a96d8471 100644
+index ac4deeb6acebf79987591756320e2406d74d7a1e..f688e6d1e6c11f0dd80f498e6361fa822e8c2eb8 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 b390356721fa226c348923f33601c4a1a2d9702d..97a3ea6f292563a41fd41f812ac72526
      WebContents* source,
      const OpenURLParams& params,
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f7727570c4ba 100644
+index ac2e7cdceb13ce07966a908fab3ff8feff969484..96cb58b1a88499cf8f78d748dc5a1cc1c6b6a128 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 da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f772
  #include "content/public/browser/eye_dropper.h"
  #include "content/public/browser/fullscreen_types.h"
  #include "content/public/browser/invalidate_type.h"
-@@ -376,6 +377,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -375,6 +376,13 @@ class CONTENT_EXPORT WebContentsDelegate {
        const StoragePartitionConfig& partition_config,
        SessionStorageNamespace* session_storage_namespace);
  
@@ -148,10 +148,10 @@ index da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f772
    // 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 7f33a5452de32f5f4f8a43d0314917f24308d77c..b0aa018f2f4e6865915516ab6b65fac20d9e6f20 100644
+index 0e2524de1159d7e2628c66d188002c6a417bfa52..0fb92081a1bbfb14c0ddd74dfe91f94bb2be1d2a 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -6938,6 +6938,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
+@@ -6924,6 +6924,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
            request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
            GetWebFrame()->IsAdScriptInStack());
  
@@ -163,10 +163,10 @@ index 7f33a5452de32f5f4f8a43d0314917f24308d77c..b0aa018f2f4e6865915516ab6b65fac2
    // 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 e5f7596c1b3e525e1d64efbd6b7e0703b980dac9..0b4523200651c1edfd7678b177a24b7e64de6ddf 100644
+index fa36b9907988ab971c94eae317e6e1dc4d170762..a2cafef6cae2fd78580fdf90dae17ac6586a7312 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -538,6 +538,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -534,6 +534,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -176,10 +176,10 @@ index e5f7596c1b3e525e1d64efbd6b7e0703b980dac9..0b4523200651c1edfd7678b177a24b7e
      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 e4eaba65b25262ce5ed27d78da13a260ec57f6db..ddd3be9aa7aac43140a1e664eefce7ac195ba119 100644
+index 9c6bbdc4f8e4f78fd745ac4e71510d9534925a78..f4a68476f71e8283bb3da3642758416efb98c168 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
-@@ -95,6 +95,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
+@@ -93,6 +93,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 de39a688207f81143c59ad54385642389b0fcc4e..93c5b79727674ff1c5344d39fd7bcd07c3101424 100644
+index 70d107d7c99056e790d75755855b804ed1961a90..a0ed0e7cd27532dcf2c327874ae4573c70290ecd 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2280,6 +2280,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2270,6 +2270,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, entered_window);