fix: showMessageDialog should center dialog to parent (#48215 )

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
fix: ensure dragging works again after emitting contextmenu event (#48224 )
2026-02-26 03:01:17 -05:00 · 2025-09-01 14:56:47 -07:00 · 2025-08-29 13:15:17 -04:00 · 2025-08-28 16:39:10 -04:00 · 2025-08-28 10:57:06 -07:00 · 2025-08-28 10:51:07 -07:00
39 changed files with 415 additions and 613 deletions
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -17,9 +17,6 @@ inputs:
  is-release:
    description: 'Is release build'
    required: true
-  strip-binaries:
-    description: 'Strip binaries (Linux only)'
-    required: false
  generate-symbols:
    description: 'Generate symbols'
    required: true
@@ -63,22 +60,14 @@ runs:
          sudo launchctl limit maxfiles 65536 200000
        fi

-        NINJA_SUMMARIZE_BUILD=1 e build -j $NUMBER_OF_NINJA_PROCESSES
+        NINJA_SUMMARIZE_BUILD=1 e build
        cp out/Default/.ninja_log out/electron_ninja_log
        node electron/script/check-symlinks.js
-    - name: Strip Electron Binaries ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ inputs.strip-binaries == 'true' }}
-      run: |
-        cd src
-        electron/script/copy-debug-symbols.py --target-cpu="${{ inputs.target-arch }}" --out-dir=out/Default/debug --compress
-        electron/script/strip-binaries.py --target-cpu="${{ inputs.target-arch }}" --verbose
-        electron/script/add-debug-link.py --target-cpu="${{ inputs.target-arch }}" --debug-dir=out/Default/debug
    - name: Build Electron dist.zip ${{ inputs.step-suffix }}
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES -d explain
+        e build --target electron:electron_dist_zip
        if [ "${{ inputs.is-asan }}" != "true" ]; then
          target_os=${{ inputs.target-platform == 'macos' && 'mac' || inputs.target-platform }}
          if [ "${{ inputs.artifact-platform }}" = "mas" ]; then
@@ -90,7 +79,7 @@ runs:
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+        e build --target electron:electron_mksnapshot
        ELECTRON_DEPOT_TOOLS_DISABLE_LOG=1 e d gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
        # Remove unused args from mksnapshot_args
        SEDOPTION="-i"
@@ -100,20 +89,7 @@ runs:
        sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
        sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args

-        if [ "${{ inputs.target-platform }}" = "linux" ]; then
-          if [ "${{ inputs.target-arch }}" = "arm" ]; then
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/v8_context_snapshot_generator
-          elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/v8_context_snapshot_generator
-          else
-            electron/script/strip-binaries.py --file $PWD/out/Default/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
-          fi
-        fi
-
-        e build --target electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
+        e build --target electron:electron_mksnapshot_zip
        if [ "${{ inputs.target-platform }}" = "win" ]; then
          cd out/Default
          powershell Compress-Archive -update mksnapshot_args mksnapshot.zip
@@ -147,7 +123,7 @@ runs:
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES
+        e build --target electron:electron_chromedriver
        e build --target electron:electron_chromedriver_zip
    - name: Build Node.js headers ${{ inputs.step-suffix }}
      shell: bash
@@ -190,24 +166,24 @@ runs:
          electron/script/zip-symbols.py -b $BUILD_PATH
        fi
    - name: Generate FFMpeg ${{ inputs.step-suffix }}
-      if: ${{ inputs.is-release == 'true' }}
      shell: bash
+      if: ${{ inputs.is-release == 'true' }}
      run: |
        cd src
-        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS"
-        e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg -j $NUMBER_OF_NINJA_PROCESSES
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true use_siso=true $GN_EXTRA_ARGS"
+        e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg
    - name: Generate Hunspell Dictionaries ${{ inputs.step-suffix }}
      shell: bash
      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
      run: |
-        e build --target electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
+        e build --target electron:hunspell_dictionaries_zip
    - name: Generate Libcxx ${{ inputs.step-suffix }}
      shell: bash
      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
      run: |
-        e build --target electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        e build --target electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        e build --target electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
+        e build --target electron:libcxx_headers_zip
+        e build --target electron:libcxxabi_headers_zip
+        e build --target electron:libcxx_objects_zip
    - name: Remove Clang problem matcher
      shell: bash
      run: echo "::remove-matcher owner=clang::"
@@ -230,7 +206,29 @@ runs:
          echo 'Uploading Electron release distribution to GitHub releases'
          script/release/uploaders/upload.py --verbose
        fi
+    - name: Generate siso report
+      if: ${{ inputs.target-platform != 'win' && !cancelled() }}
+      shell: bash
+      run: |
+        cd src
+        e d siso report -C out/Default > siso_report.txt
+        SISO_REPORT_PATH=$(grep -o '/.*siso-report-[^ ]*' siso_report.txt)
+        echo "SISO_REPORT_PATH=$SISO_REPORT_PATH" >> $GITHUB_ENV
+        cat siso_report.txt
+        echo "SISO REPORT AT $SISO_REPORT_PATH"
+    - name: Generate siso report (Windows)
+      if: ${{ inputs.target-platform == 'win' && !cancelled() }}
+      shell: powershell
+      run: |
+        cd src
+        e d siso report -C out\Default > siso_report.txt
+        $SISO_REPORT_PATH = Get-Content "siso_report.txt" | Select-String "report file:\s*(.+)" | ForEach-Object { 
+          $_.Matches.Groups[1].Value.Trim() 
+        }
+        echo "SISO_REPORT_PATH=$SISO_REPORT_PATH"
+        echo "SISO_REPORT_PATH=$SISO_REPORT_PATH" >> $env:GITHUB_ENV
    - name: Generate Artifact Key
+      if: always() && !cancelled()
      shell: bash
      run: |
        if [ "${{ inputs.is-asan }}" = "true" ]; then 
@@ -242,9 +240,11 @@ runs:
    # The current generated_artifacts_<< artifact.key >> name was taken from CircleCI
    # to ensure we don't break anything, but we may be able to improve that.
    - name: Move all Generated Artifacts to Upload Folder ${{ inputs.step-suffix }}
+      if: always() && !cancelled()
      shell: bash
      run: ./src/electron/script/actions/move-artifacts.sh
    - name: Upload Generated Artifacts ${{ inputs.step-suffix }}
+      if: always() && !cancelled()
      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
      with:
        name: generated_artifacts_${{ env.ARTIFACT_KEY }}
--- a/.github/actions/cipd-install/action.yml
+++ b/.github/actions/cipd-install/action.yml
@@ -14,6 +14,9 @@ inputs:
    description: 'Target platform, should be linux, win, macos'
  package:
    description: 'Package to install'
+  dependency-version:
+    description: 'Version of the dependency to install'
+    default: ''
 runs:
  using: "composite"
  steps:
@@ -22,15 +25,23 @@ runs:
      run : |
        rm -rf ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }}
    - name: Create ensure file for ${{ inputs.dependency }}
+      if: ${{ inputs.dependency-version == '' }}
      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' }}
+
+    - name: Create ensure file for ${{ inputs.dependency }} from dependency-version
+      if: ${{ inputs.dependency-version != '' }}
      shell: bash
      run: |
-        echo "ensuring ${{ inputs.dependency }} on macOS"
+        echo '${{ inputs.package }} ${{ inputs.dependency-version }}'  > ${{ inputs.dependency }}_ensure_file
+        cat ${{ inputs.dependency }}_ensure_file
+    - name: CIPD installation of ${{ inputs.dependency }} (macOS)
+      if: ${{ inputs.target-platform != 'win' }}
+      shell: bash
+      run: |
+        echo "ensuring ${{ inputs.dependency }}"
        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' }}
--- a/.github/actions/fix-sync/action.yml
+++ b/.github/actions/fix-sync/action.yml
@@ -20,6 +20,7 @@ runs:
  using: "composite"
  steps:
    - name: Fix llvm toolchain
+      if: ${{ inputs.target-platform != 'linux' }}
      shell: bash
      run : |
        rm -rf src/third_party/llvm-build
@@ -27,6 +28,7 @@ runs:
        # Refs https://chromium-review.googlesource.com/c/chromium/src/+/6667681
        python3 src/tools/clang/scripts/update.py --package objdump
    - name: Fix esbuild
+      if: ${{ inputs.target-platform != 'linux' }}
      uses: ./src/electron/.github/actions/cipd-install
      with:
        cipd-root-prefix-path: src/third_party/devtools-frontend/src/
@@ -36,6 +38,7 @@ runs:
        target-platform: ${{ inputs.target-platform }}
        package: infra/3pp/tools/esbuild/${platform}
    - name: Fix rustc
+      if: ${{ inputs.target-platform != 'linux' }}
      shell: bash
      run : |
        rm -rf src/third_party/rust-toolchain
@@ -59,6 +62,7 @@ runs:
        target-platform: ${{ inputs.target-platform }}
        package: gn/gn/windows-amd64
    - name: Fix reclient
+      if: ${{ inputs.target-platform != 'linux' }}
      uses: ./src/electron/.github/actions/cipd-install
      with:
        dependency: reclient
@@ -67,6 +71,7 @@ runs:
        target-platform: ${{ inputs.target-platform }}
        package: infra/rbe/client/${platform}
    - name: Configure reclient configs
+      if: ${{ inputs.target-platform != 'linux' }}
      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
@@ -84,6 +89,7 @@ runs:
          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
+      if: ${{ inputs.target-platform != 'linux' }}
      uses: ./src/electron/.github/actions/cipd-install
      with:
        dependency: ninja
@@ -92,10 +98,20 @@ runs:
        target-platform: ${{ inputs.target-platform }}
        package: infra/3pp/tools/ninja/${platform}
    - name: Set ninja in path
+      if: ${{ inputs.target-platform != 'linux' }}
      shell: bash
      run : |
        echo "$(pwd)/src/third_party/ninja" >> $GITHUB_PATH
+    - name: Fix siso
+      uses: ./src/electron/.github/actions/cipd-install
+      with:
+        dependency: siso
+        deps-file: src/DEPS
+        installation-dir: src/third_party/siso/cipd
+        target-platform: ${{ inputs.target-platform }}
+        package: infra/build/siso/${platform}
    - name: Fixup angle git
+      if: ${{ inputs.target-platform != 'linux' }}
      shell: bash
      run : |
        cd src/third_party/angle
--- a/.github/actions/install-build-tools/action.yml
+++ b/.github/actions/install-build-tools/action.yml
@@ -13,8 +13,9 @@ runs:
        git config --global core.fscache true
        git config --global core.longpaths true
        git config --global core.preloadindex true
+        git config --global core.longpaths true
      fi
-      export BUILD_TOOLS_SHA=274cba0474f0d1e4e6adbb66c1da48556cb0add5
+      export BUILD_TOOLS_SHA=8559e5d325d61f195a255f41077ffc9e5b70b0e5
      npm i -g @electron/build-tools
      # Update depot_tools to ensure python
      e d update_depot_tools
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -329,7 +329,7 @@ jobs:
    if: ${{ needs.setup.outputs.src == 'true' }}
    with:
      build-runs-on: electron-arc-centralus-linux-amd64-32core
-      test-runs-on: electron-arc-centralus-linux-arm64-4core
+      test-runs-on: ubuntu-22.04-arm
      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
      target-platform: linux
@@ -388,7 +388,7 @@ jobs:
    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
    with:
      build-runs-on: electron-arc-centralus-windows-amd64-16core
-      test-runs-on: electron-hosted-windows-arm64-4core
+      test-runs-on: windows-11-arm
      target-platform: win
      target-arch: arm64
      is-release: false
--- a/.github/workflows/linux-publish.yml
+++ b/.github/workflows/linux-publish.yml
@@ -50,7 +50,6 @@ jobs:
      is-release: true
      gn-build-type: release
      generate-symbols: true
-      strip-binaries: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
    secrets: inherit

@@ -66,7 +65,6 @@ jobs:
      is-release: true
      gn-build-type: release
      generate-symbols: true
-      strip-binaries: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
    secrets: inherit

@@ -82,6 +80,5 @@ jobs:
      is-release: true
      gn-build-type: release
      generate-symbols: true
-      strip-binaries: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
    secrets: inherit
--- a/.github/workflows/pipeline-segment-electron-build.yml
+++ b/.github/workflows/pipeline-segment-electron-build.yml
@@ -48,11 +48,6 @@ on:
        required: true
        type: string
        default: '0'
-      strip-binaries: 
-        description: 'Strip the binaries before release (Linux only)'
-        required: false
-        type: boolean
-        default: false
      is-asan: 
        description: 'Building the Address Sanitizer (ASan) Linux build'
        required: false
@@ -176,7 +171,7 @@ jobs:
        ELECTRON_DEPOT_TOOLS_DISABLE_LOG: true
    - 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 }}
+        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --remote-build siso
    - name: Run Electron Only Hooks
      run: |
        e d gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
@@ -186,9 +181,6 @@ 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: Setup Number of Ninja Processes
-      run: |
-        echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform != 'macos' && '300' || '200' }}" >> $GITHUB_ENV
    - name: Free up space (macOS)
      if: ${{ inputs.target-platform == 'macos' }}
      uses: ./src/electron/.github/actions/free-space-macos
@@ -201,7 +193,6 @@ jobs:
        artifact-platform: ${{ inputs.target-platform == 'macos' && 'darwin' || inputs.target-platform }}
        is-release: '${{ inputs.is-release }}'
        generate-symbols: '${{ inputs.generate-symbols }}'
-        strip-binaries: '${{ inputs.strip-binaries }}'
        upload-to-storage: '${{ inputs.upload-to-storage }}'
        is-asan: '${{ inputs.is-asan }}'
    - name: Set GN_EXTRA_ARGS for MAS Build
--- a/.github/workflows/pipeline-segment-electron-test.yml
+++ b/.github/workflows/pipeline-segment-electron-test.yml
@@ -68,21 +68,6 @@ jobs:
      if: ${{ inputs.target-arch == 'arm' && inputs.target-platform == 'linux' }}
      run: |
        cp $(which node) /mnt/runner-externals/node20/bin/
-    - name: Install Git on Windows arm64 runners
-      if: ${{ inputs.target-arch == 'arm64' && inputs.target-platform == 'win' }}
-      shell: powershell
-      run: |
-        Set-ExecutionPolicy Bypass -Scope Process -Force
-        [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-        iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-        choco install -y --no-progress git.install --params "'/GitAndUnixToolsOnPath'"
-        choco install -y --no-progress git
-        choco install -y --no-progress python --version 3.11.9
-        choco install -y --no-progress visualstudio2022-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.ARM64"
-        echo "C:\Program Files\Git\cmd" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "C:\Python311" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        cp "C:\Python311\python.exe" "C:\Python311\python3.exe"
    - name: Setup Node.js/npm
      if: ${{ inputs.target-platform == 'win' }}
      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
@@ -154,6 +139,7 @@ jobs:
        git config --global core.fscache true
        git config --global core.longpaths true
        git config --global core.preloadindex true
+        git config --global core.longpaths 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
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -44,6 +44,7 @@ if (is_mac) {

 if (is_linux) {
  import("//build/config/linux/pkg_config.gni")
+  import("//electron/build/linux/strip_binary.gni")
  import("//tools/generate_stubs/rules.gni")

  pkg_config("gio_unix") {
@@ -1422,6 +1423,18 @@ dist_zip("electron_dist_zip") {
    ":licenses",
  ]
  if (is_linux) {
+    if (is_official_build) {
+      data_deps += [
+        ":strip_chrome_crashpad_handler",
+        ":strip_chrome_sandbox",
+        ":strip_electron_binary",
+        ":strip_libEGL_shlib",
+        ":strip_libGLESv2_shlib",
+        ":strip_libffmpeg_shlib",
+        ":strip_libvk_swiftshader_shlib",
+      ]
+    }
+
    data_deps += [ "//sandbox/linux:chrome_sandbox" ]
  }
  deps = data_deps
@@ -1467,6 +1480,16 @@ group("electron_mksnapshot") {

 dist_zip("electron_mksnapshot_zip") {
  data_deps = mksnapshot_deps
+  if (is_linux && is_official_build) {
+    data_deps += [
+      ":strip_libEGL_shlib",
+      ":strip_libGLESv2_shlib",
+      ":strip_libffmpeg_shlib",
+      ":strip_libvk_swiftshader_shlib",
+      ":strip_mksnapshot_binary",
+      ":strip_v8_context_snapshot_generator_binary",
+    ]
+  }
  deps = data_deps
  outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }
@@ -1591,3 +1614,78 @@ group("copy_node_headers") {
 group("node_headers") {
  public_deps = [ ":tar_node_headers" ]
 }
+
+if (is_linux && is_official_build) {
+  strip_binary("strip_electron_binary") {
+    binary_input = "$root_out_dir/$electron_project_name"
+    symbol_output = "$root_out_dir/debug/$electron_project_name.debug"
+    compress_debug_sections = true
+    deps = [ ":electron_app" ]
+  }
+
+  strip_binary("strip_chrome_crashpad_handler") {
+    binary_input = "$root_out_dir/chrome_crashpad_handler"
+    symbol_output = "$root_out_dir/debug/chrome_crashpad_handler.debug"
+    compress_debug_sections = true
+    deps = [ "//components/crash/core/app:chrome_crashpad_handler" ]
+  }
+
+  strip_binary("strip_chrome_sandbox") {
+    binary_input = "$root_out_dir/chrome_sandbox"
+    symbol_output = "$root_out_dir/debug/chrome-sandbox.debug"
+    compress_debug_sections = true
+    deps = [ "//sandbox/linux:chrome_sandbox" ]
+  }
+
+  strip_binary("strip_libEGL_shlib") {
+    binary_input = "$root_out_dir/libEGL.so"
+    symbol_output = "$root_out_dir/debug/libEGL.so.debug"
+    compress_debug_sections = true
+    deps = [ "//third_party/angle:libEGL" ]
+  }
+
+  strip_binary("strip_libGLESv2_shlib") {
+    binary_input = "$root_out_dir/libGLESv2.so"
+    symbol_output = "$root_out_dir/debug/libGLESv2.so.debug"
+    compress_debug_sections = true
+    deps = [ "//third_party/angle:libGLESv2" ]
+  }
+
+  strip_binary("strip_libffmpeg_shlib") {
+    binary_input = "$root_out_dir/libffmpeg.so"
+    symbol_output = "$root_out_dir/debug/libffmpeg.so.debug"
+    compress_debug_sections = true
+    deps = [ "//third_party/ffmpeg" ]
+  }
+
+  strip_binary("strip_libvk_swiftshader_shlib") {
+    binary_input = "$root_out_dir/libvk_swiftshader.so"
+    symbol_output = "$root_out_dir/debug/libvk_swiftshader.so.debug"
+    compress_debug_sections = true
+    deps = [ "//third_party/swiftshader/src/Vulkan:swiftshader_libvulkan" ]
+  }
+
+  strip_binary("strip_mksnapshot_binary") {
+    _binary_path = rebase_path(
+            get_label_info(
+                    ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
+                    "root_out_dir") + "/mksnapshot",
+            root_build_dir)
+    binary_input = "$root_out_dir/$_binary_path"
+    symbol_output = "$root_out_dir/debug/${_binary_path}.debug"
+    compress_debug_sections = true
+    deps = mksnapshot_deps
+  }
+
+  strip_binary("strip_v8_context_snapshot_generator_binary") {
+    _binary_path = rebase_path(
+            get_label_info(
+                    ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
+                    "root_out_dir") + "/v8_context_snapshot_generator",
+            root_build_dir)
+    binary_input = "$root_out_dir/$_binary_path"
+    symbol_output = "$root_out_dir/debug/${_binary_path}.debug"
+    compress_debug_sections = true
+    deps = mksnapshot_deps
+  }
+}
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '140.0.7339.24',
+    '140.0.7339.41',
  'node_version':
    'v22.18.0',
  'nan_version':
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -70,6 +70,5 @@ v8_expose_public_symbols = true
 # sensitive content by enterprise users.
 enterprise_cloud_content_analysis = false

-# Disable siso until we are ready to use it.
-# https://chromium-review.googlesource.com/c/chromium/src/+/6638830
-use_siso = false
+# We don't use anything from here, and it causes target collisions
+enable_linux_installer = false
--- a/build/linux/strip_binary.gni
+++ b/build/linux/strip_binary.gni
@@ -0,0 +1,70 @@
+# Copyright 2021 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This has been adapted from https://source.chromium.org/chromium/chromium/src/+/main:build/linux/strip_binary.gni;drc=c220a41e0422d45f1657c28146d32e99cc53640b
+# The notable difference is it has an option to compress the debug sections
+
+import("//build/config/clang/clang.gni")
+import("//build/toolchain/toolchain.gni")
+
+# Extracts symbols from a binary into a symbol file.
+#
+# Args:
+#   binary_input: Path to the binary containing symbols to extract, e.g.:
+#       "$root_out_dir/chrome"
+#   symbol_output: Desired output file for symbols, e.g.:
+#       "$root_out_dir/chrome.debug"
+#   stripped_binary_output: Desired output file for stripped file, e.g.:
+#       "$root_out_dir/chrome.stripped"
+#   compress_debug_sections: If true, compress the extracted debug sections
+template("strip_binary") {
+  forward_variables_from(invoker,
+                         [
+                           "deps",
+                           "testonly",
+                         ])
+  action("${target_name}") {
+    llvm_strip_binary = "${clang_base_path}/bin/llvm-strip"
+    llvm_objcopy_binary = "${clang_base_path}/bin/llvm-objcopy"
+    script = "//electron/build/linux/strip_binary.py"
+
+    if (defined(invoker.stripped_binary_output)) {
+      stripped_binary_output = invoker.stripped_binary_output
+    } else {
+      stripped_binary_output = invoker.binary_input + ".stripped"
+    }
+    if (defined(invoker.symbol_output)) {
+      symbol_output = invoker.symbol_output
+    } else {
+      symbol_output = invoker.binary_input + ".debug"
+    }
+
+    inputs = [
+      invoker.binary_input,
+      llvm_strip_binary,
+      llvm_objcopy_binary,
+    ]
+    outputs = [
+      symbol_output,
+      stripped_binary_output,
+    ]
+    args = [
+      "--llvm-strip-binary-path",
+      rebase_path(llvm_strip_binary, root_build_dir),
+      "--llvm-objcopy-binary-path",
+      rebase_path(llvm_objcopy_binary, root_build_dir),
+      "--symbol-output",
+      rebase_path(symbol_output, root_build_dir),
+      "--stripped-binary-output",
+      rebase_path(stripped_binary_output, root_build_dir),
+      "--binary-input",
+      rebase_path(invoker.binary_input, root_build_dir),
+    ]
+
+    if (defined(invoker.compress_debug_sections) &&
+        invoker.compress_debug_sections) {
+      args += [ "--compress-debug-sections" ]
+    }
+  }
+}
--- a/build/linux/strip_binary.py
+++ b/build/linux/strip_binary.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+#
+# Copyright 2021 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This has been adapted from https://source.chromium.org/chromium/chromium/src/+/main:build/linux/strip_binary.py;drc=c220a41e0422d45f1657c28146d32e99cc53640b
+# The notable difference is it has an option to compress the debug sections
+
+import argparse
+import subprocess
+import sys
+
+
+def main() -> int:
+  parser = argparse.ArgumentParser(description="Strip binary using LLVM tools.")
+  parser.add_argument("--llvm-strip-binary-path",
+                      help="Path to llvm-strip executable.")
+  parser.add_argument("--llvm-objcopy-binary-path",
+                      required=True,
+                      help="Path to llvm-objcopy executable.")
+  parser.add_argument("--binary-input", help="Input ELF binary.")
+  parser.add_argument("--symbol-output",
+                      help="File to write extracted debug info (.debug).")
+  parser.add_argument("--compress-debug-sections",
+                      action="store_true",
+                      help="Compress extracted debug info.")
+  parser.add_argument("--stripped-binary-output",
+                      help="File to write stripped binary.")
+  args = parser.parse_args()
+
+  # Replicate the behavior of:
+  # eu-strip <binary_input> -o <stripped_binary_output> -f <symbol_output>
+
+  objcopy_args = [
+      "--only-keep-debug",
+      args.binary_input,
+      args.symbol_output,
+  ]
+
+  if args.compress_debug_sections:
+    objcopy_args.insert(0, "--compress-debug-sections")
+
+  subprocess.check_output([args.llvm_objcopy_binary_path] + objcopy_args)
+  subprocess.check_output([
+      args.llvm_strip_binary_path,
+      "--strip-debug",
+      "--strip-unneeded",
+      "-o",
+      args.stripped_binary_output,
+      args.binary_input,
+  ])
+  subprocess.check_output([
+      args.llvm_objcopy_binary_path,
+      f"--add-gnu-debuglink={args.symbol_output}",
+      args.stripped_binary_output,
+  ])
+
+  return 0
+
+
+if __name__ == "__main__":
+  sys.exit(main())
--- a/build/siso/backend.star
+++ b/build/siso/backend.star
@@ -3,7 +3,7 @@
 load("@builtin//struct.star", "module")

 def __platform_properties(ctx):
-    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b"
+    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a"
    return {
        "default": {
            "OSFamily": "Linux",
--- a/build/siso/main.star
+++ b/build/siso/main.star
@@ -0,0 +1,66 @@
+load("@builtin//encoding.star", "json")
+load("@builtin//path.star", "path")
+load("@builtin//runtime.star", "runtime")
+load("@builtin//struct.star", "module")
+load("@config//main.star", upstream_init = "init")
+load("@config//win_sdk.star", "win_sdk")
+load("@config//gn_logs.star", "gn_logs")
+
+def init(ctx):
+    mod = upstream_init(ctx)
+    step_config = json.decode(mod.step_config)
+
+    # Buildbarn doesn't support input_root_absolute_path so disable that
+    for rule in step_config["rules"]:    
+      input_root_absolute_path = rule.get("input_root_absolute_path", False)
+      if input_root_absolute_path:
+        rule.pop("input_root_absolute_path", None)
+
+    # Only wrap clang rules with a remote wrapper if not on Linux. These are currently only
+    # needed for X-Compile builds, which run on Windows and Mac.
+    if runtime.os != "linux":
+      for rule in step_config["rules"]:
+        if rule["name"].startswith("clang/") or rule["name"].startswith("clang-cl/"):
+          rule["remote_wrapper"] = "../../buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper"
+          if "inputs" not in rule:
+            rule["inputs"] = []
+          rule["inputs"].append("buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper")
+          rule["inputs"].append("third_party/llvm-build/Release+Asserts_linux/bin/clang")
+
+      if "executables" not in step_config:
+        step_config["executables"] = []
+      step_config["executables"].append("buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper")
+      step_config["executables"].append("third_party/llvm-build/Release+Asserts_linux/bin/clang")
+
+    if runtime.os == "darwin":
+      # Update platforms to match our default siso config instead of reclient configs.
+      step_config["platforms"].update({
+          "clang": step_config["platforms"]["default"],
+          "clang_large": step_config["platforms"]["default"],          
+      })      
+
+    if runtime.os == "windows":
+      # Add additional Windows SDK headers needed by Electron      
+      win_toolchain_dir = win_sdk.toolchain_dir(ctx)
+      if win_toolchain_dir:
+        sdk_version = gn_logs.read(ctx).get("windows_sdk_version")
+        step_config["input_deps"][win_toolchain_dir + ":headers"].extend([
+          # third_party/electron_node/deps/uv/include/uv/win.h includes mswsock.h
+          path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/mswsock.h"),
+          # third_party/electron_node/src/debug_utils.cc includes lm.h
+          path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/Lm.h"),          
+        ])
+      
+      # Update platforms to match our default siso config instead of reclient configs.
+      step_config["platforms"].update({
+          "clang-cl": step_config["platforms"]["default"],
+          "clang-cl_large": step_config["platforms"]["default"],
+          "lld-link": step_config["platforms"]["default"],
+      })
+
+    return module(
+      "config",
+      step_config = json.encode(step_config),
+      filegroups = mod.filegroups,
+      handlers = mod.handlers,
+    )
--- a/build/zip.py
+++ b/build/zip.py
@@ -41,6 +41,8 @@ PATHS_TO_SKIP = [
  'resources/inspector',
  'gen/third_party/devtools-frontend/src',
  'gen/ui/webui',
+  # Skip because these get zipped separately in script/zip-symbols.py
+  'debug',
 ]

 def skip_path(dep, dist_zip, target_cpu):
@@ -80,6 +82,11 @@ def main(argv):
      dep = dep.strip()
      if not skip_path(dep, dist_zip, target_cpu):
        dist_files.add(dep)
+  # On Linux, filter out any files which have a .stripped companion
+  if sys.platform == 'linux':
+    dist_files = {
+      dep for dep in dist_files if f"{dep.removeprefix('./')}.stripped" not in dist_files
+    }
  if sys.platform == 'darwin' and not should_flatten:
    execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
  else:
@@ -96,10 +103,13 @@ def main(argv):
          dirname = os.path.dirname(dep)
          arcname = (
            os.path.join(dirname, 'chrome-sandbox')
-            if basename == 'chrome_sandbox'
+            if basename.removesuffix('.stripped') == 'chrome_sandbox'
            else dep
          )
          name_to_write = arcname
+          # On Linux, strip the .stripped suffix from the name before zipping
+          if sys.platform == 'linux':
+            name_to_write = name_to_write.removesuffix('.stripped')
          if should_flatten:
            if flatten_relative_to:
              if name_to_write.startswith(flatten_relative_to):
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -1,3 +1,5 @@
+# MenuItem
+
 ## Class: MenuItem

 > Add items to native application menus and context menus.
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -211,6 +211,10 @@ Returns `Object`:
  system.
 * `free` Integer - The total amount of memory not being used by applications or disk
  cache.
+* `fileBacked` Integer _macOS_ - The amount of memory that currently has been paged out to storage.
+  Includes memory for file caches, network buffers, and other system services.
+* `purgeable` Integer _macOS_ - The amount of memory that is marked as "purgeable". The system can reclaim it
+  if memory pressure increases.
 * `swapTotal` Integer _Windows_ _Linux_ - The total amount of swap memory in Kilobytes available to the
  system.
 * `swapFree` Integer _Windows_ _Linux_ - The free amount of swap memory in Kilobytes available to the
--- a/docs/api/service-worker-main.md
+++ b/docs/api/service-worker-main.md
@@ -1,11 +1,7 @@
-# ServiceWorkerMain
+## Class: ServiceWorkerMain

 > An instance of a Service Worker representing a version of a script for a given scope.

-Process: [Main](../glossary.md#main-process)
-
-## Class: ServiceWorkerMain
-
 Process: [Main](../glossary.md#main-process)<br />
 _This class is not exported from the `'electron'` module. It is only available as a return value of other methods in the Electron API._

--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -191,12 +191,6 @@ $ ./out/Testing/electron

 ### Packaging

-On linux, first strip the debugging and symbol information:
-
-```sh
-$ electron/script/strip-binaries.py -d out/Release
-```
-
 To package the electron build as a distributable zip file:

 ```sh
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -9,7 +9,8 @@ check out our [Electron Versioning](./electron-versioning.md) doc.

 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 38.0.0 |  2025-Jun-26 | 2025-Aug-06 | 2025-Sep-02 | 2026-Mar-10 | M140 | TBD | ✅ |
+| 39.0.0 |  2025-Sep-04 | 2025-Oct-01 | 2025-Oct-28 | 2026-May-05 | M142 | TBD | ✅ |
+| 38.0.0 |  2025-Jun-26 | 2025-Aug-06 | 2025-Sep-02 | 2026-Mar-10 | M140 | v22.18 | ✅ |
 | 37.0.0 |  2025-May-01 | 2025-May-28 | 2025-Jun-24 | 2026-Jan-13 | M138 | v22.16 | ✅ |
 | 36.0.0 |  2025-Mar-06 | 2025-Apr-02 | 2025-Apr-29 | 2025-Oct-28 | M136 | v22.14 | ✅ |
 | 35.0.0 |  2025-Jan-16 | 2025-Feb-05 | 2025-Mar-04 | 2025-Sep-02 | M134 | v22.14 | ✅ |
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -132,9 +132,7 @@ chore_grandfather_in_electron_views_and_delegates.patch
 refactor_patch_electron_permissiontypes_into_blink.patch
 revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
 build_partial_revert_mac_fullscreen_top_chrome_mouse_events.patch
-revert_update_siso-chromium_image.patch
 build_set_mac_sdk_minimum_to_10.patch
 fix_add_macos_memory_query_fallback_to_avoid_crash.patch
 fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
-chore_restore_some_deprecated_wrapper_utility_in_gin.patch
 feat_add_support_for_embedder_snapshot_validation.patch
--- a/patches/chromium/chore_restore_some_deprecated_wrapper_utility_in_gin.patch
+++ b/patches/chromium/chore_restore_some_deprecated_wrapper_utility_in_gin.patch
@@ -1,174 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Tue, 5 Aug 2025 02:26:29 +0900
-Subject: chore: restore some deprecated wrapper utility in gin
-
-Restores part of https://chromium-review.googlesource.com/c/chromium/src/+/6799157
-
-Patch can be removed once cppgc migration is complete
-https://github.com/electron/electron/issues/47922
-
-diff --git a/gin/object_template_builder.cc b/gin/object_template_builder.cc
-index 5a31687bbd0fca61db3a7c41ed73d938340d6446..b84f5fd336bc4b61b2cd0b2fc92382b00e928701 100644
--- a/gin/object_template_builder.cc
-+++ b/gin/object_template_builder.cc
-@@ -141,7 +141,7 @@ ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
-                   : "Objects of this type cannot be created using the "
-                     "constructor"))),
-       template_(constructor_template_->InstanceTemplate()) {
-  template_->SetInternalFieldCount(0);
-+  template_->SetInternalFieldCount(kNumberOfInternalFields);
- }
- 
- ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
-diff --git a/gin/per_isolate_data.cc b/gin/per_isolate_data.cc
-index 884990426f13a6abca22a60dd8cc0685f8435b23..64ac0a64a05105532f3cda898aeac68c21338e60 100644
--- a/gin/per_isolate_data.cc
-+++ b/gin/per_isolate_data.cc
-@@ -68,12 +68,32 @@ PerIsolateData* PerIsolateData::From(Isolate* isolate) {
-   return static_cast<PerIsolateData*>(isolate->GetData(kEmbedderNativeGin));
- }
- 
-+void PerIsolateData::DeprecatedSetObjectTemplate(DeprecatedWrapperInfo* info,
-+                                                 Local<ObjectTemplate> templ) {
-+  deprecated_object_templates_[info] = Eternal<ObjectTemplate>(isolate_, templ);
-+}
-+
- void PerIsolateData::SetObjectTemplate(
-     const WrapperInfo* info,
-     Local<ObjectTemplate> templ) {
-   object_templates_[info] = Eternal<ObjectTemplate>(isolate_, templ);
- }
- 
-+void PerIsolateData::SetFunctionTemplate(DeprecatedWrapperInfo* info,
-+                                         Local<FunctionTemplate> templ) {
-+  function_templates_[info] = Eternal<FunctionTemplate>(isolate_, templ);
-+}
-+
-+v8::Local<v8::ObjectTemplate> PerIsolateData::DeprecatedGetObjectTemplate(
-+    DeprecatedWrapperInfo* info) {
-+  DeprecatedObjectTemplateMap::iterator it =
-+      deprecated_object_templates_.find(info);
-+  if (it == deprecated_object_templates_.end()) {
-+    return v8::Local<v8::ObjectTemplate>();
-+  }
-+  return it->second.Get(isolate_);
-+}
-+
- v8::Local<v8::ObjectTemplate> PerIsolateData::GetObjectTemplate(
-     const WrapperInfo* info) {
-   ObjectTemplateMap::iterator it = object_templates_.find(info);
-@@ -83,6 +103,15 @@ v8::Local<v8::ObjectTemplate> PerIsolateData::GetObjectTemplate(
-   return it->second.Get(isolate_);
- }
- 
-+v8::Local<v8::FunctionTemplate> PerIsolateData::GetFunctionTemplate(
-+    DeprecatedWrapperInfo* info) {
-+  FunctionTemplateMap::iterator it = function_templates_.find(info);
-+  if (it == function_templates_.end()) {
-+    return v8::Local<v8::FunctionTemplate>();
-+  }
-+  return it->second.Get(isolate_);
-+}
-+
- void PerIsolateData::AddDisposeObserver(DisposeObserver* observer) {
-   dispose_observers_.AddObserver(observer);
- }
-diff --git a/gin/per_isolate_data.h b/gin/per_isolate_data.h
-index bce889749415da341e6e6e4082ac06bbeb4bb80a..d748c1cf8cef7da90686686f1b8072bcd530541d 100644
--- a/gin/per_isolate_data.h
-+++ b/gin/per_isolate_data.h
-@@ -51,11 +51,24 @@ class GIN_EXPORT PerIsolateData {
- 
-   static PerIsolateData* From(v8::Isolate* isolate);
- 
-+  void DeprecatedSetObjectTemplate(
-+      DeprecatedWrapperInfo* info,
-+      v8::Local<v8::ObjectTemplate> object_template);
-+
-   void SetObjectTemplate(const WrapperInfo* info,
-                          v8::Local<v8::ObjectTemplate> object_template);
- 
-+  void SetFunctionTemplate(DeprecatedWrapperInfo* info,
-+                           v8::Local<v8::FunctionTemplate> function_template);
-+
-+  v8::Local<v8::ObjectTemplate> DeprecatedGetObjectTemplate(
-+      DeprecatedWrapperInfo* info);
-+
-   v8::Local<v8::ObjectTemplate> GetObjectTemplate(const WrapperInfo* info);
- 
-+  v8::Local<v8::FunctionTemplate> GetFunctionTemplate(
-+      DeprecatedWrapperInfo* info);
-+
-   void AddDisposeObserver(DisposeObserver* observer);
-   void RemoveDisposeObserver(DisposeObserver* observer);
-   void NotifyBeforeDispose();
-@@ -74,14 +87,20 @@ class GIN_EXPORT PerIsolateData {
-   }
- 
-  private:
-+  typedef std::map<DeprecatedWrapperInfo*, v8::Eternal<v8::ObjectTemplate>>
-+      DeprecatedObjectTemplateMap;
-   typedef std::map<const WrapperInfo*, v8::Eternal<v8::ObjectTemplate>>
-       ObjectTemplateMap;
-+  typedef std::map<DeprecatedWrapperInfo*, v8::Eternal<v8::FunctionTemplate>>
-+      FunctionTemplateMap;
- 
-   // PerIsolateData doesn't actually own |isolate_|. Instead, the isolate is
-   // owned by the IsolateHolder, which also owns the PerIsolateData.
-   raw_ptr<v8::Isolate, AcrossTasksDanglingUntriaged> isolate_;
-   raw_ptr<v8::ArrayBuffer::Allocator, DanglingUntriaged> allocator_;
-+  DeprecatedObjectTemplateMap deprecated_object_templates_;
-   ObjectTemplateMap object_templates_;
-+  FunctionTemplateMap function_templates_;
-   base::ObserverList<DisposeObserver> dispose_observers_;
-   std::shared_ptr<V8ForegroundTaskRunnerBase> task_runner_;
-   std::shared_ptr<V8ForegroundTaskRunnerBase> user_visible_task_runner_;
-diff --git a/gin/public/wrapper_info.h b/gin/public/wrapper_info.h
-index 34b5f1c30c05152122f23708a1df62f00296fcd6..dac3459dc822db1b242288293605ab4c4a6cf76f 100644
--- a/gin/public/wrapper_info.h
-+++ b/gin/public/wrapper_info.h
-@@ -13,6 +13,17 @@
- 
- namespace gin {
- 
-+enum InternalFields {
-+  kWrapperInfoIndex,
-+  kEncodedValueIndex,
-+  kNumberOfInternalFields,
-+};
-+
-+struct GIN_EXPORT DeprecatedWrapperInfo {
-+  static DeprecatedWrapperInfo* From(v8::Local<v8::Object> object);
-+  const GinEmbedder embedder;
-+};
-+
- struct GIN_EXPORT WrapperInfo : v8::Object::WrapperTypeInfo {
-   const WrappablePointerTag pointer_tag;
- };
-diff --git a/gin/wrappable.cc b/gin/wrappable.cc
-index 803b5648e1c3ec3621149e98850bebfbf7f2de75..dd49202103993ee03379acd6873b92bc8fccb786 100644
--- a/gin/wrappable.cc
-+++ b/gin/wrappable.cc
-@@ -48,7 +48,7 @@ v8::MaybeLocal<v8::Object> WrappableBase::GetWrapper(v8::Isolate* isolate) {
-     CHECK(!templ.IsEmpty());
-     data->SetObjectTemplate(info, templ);
-   }
-  CHECK_EQ(0, templ->InternalFieldCount());
-+  CHECK_EQ(kNumberOfInternalFields, templ->InternalFieldCount());
-   v8::Local<v8::Object> wrapper;
-   // |wrapper| may be empty in some extreme cases, e.g., when
-   // Object.prototype.constructor is overwritten.
-@@ -56,6 +56,12 @@ v8::MaybeLocal<v8::Object> WrappableBase::GetWrapper(v8::Isolate* isolate) {
-     return {};
-   }
- 
-+  // Delete the internal fields once gin_helper::DeprecatedWrappable does
-+  // not exist anymore.
-+  int indices[] = {kWrapperInfoIndex, kEncodedValueIndex};
-+  void* values[] = {nullptr, nullptr};
-+  wrapper->SetAlignedPointerInInternalFields(2, indices, values);
-+
-   AssociateWithWrapper(isolate, wrapper);
-   return wrapper;
- }
--- a/patches/chromium/feat_allow_passing_of_objecttemplate_to_objecttemplatebuilder.patch
+++ b/patches/chromium/feat_allow_passing_of_objecttemplate_to_objecttemplatebuilder.patch
@@ -10,11 +10,11 @@ Electron needs this constructor, namely for gin_helper::Constructible
 objects.

 diff --git a/gin/object_template_builder.cc b/gin/object_template_builder.cc
-index 9f9ae85ad432ce71f308d6c56265a96985f42766..5a31687bbd0fca61db3a7c41ed73d938340d6446 100644
+index a694f7dc4da4f1bba579ab8c032eea21d8459995..8aaaba327166b1d3b884fe390a389c0c50890af9 100644
 --- a/gin/object_template_builder.cc
 +++ b/gin/object_template_builder.cc
-@@ -144,6 +144,13 @@ ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
-   template_->SetInternalFieldCount(0);
+@@ -146,6 +146,13 @@ ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
+   template_->SetInternalFieldCount(kNumberOfInternalFields);
 }
 
 +ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
@@ -28,10 +28,10 @@ index 9f9ae85ad432ce71f308d6c56265a96985f42766..5a31687bbd0fca61db3a7c41ed73d938
     const ObjectTemplateBuilder& other) = default;
 
 diff --git a/gin/object_template_builder.h b/gin/object_template_builder.h
-index cf4f1ae6598fdede655d33baccda254965566ea5..a4c16dc0ec3ff16413fc2a04225a2401989a084b 100644
+index 9d8f6e5de793ea419875d99a0b46898f2e40ead5..c803363b8050f4084c9250fce9b5b8b171082703 100644
 --- a/gin/object_template_builder.h
 +++ b/gin/object_template_builder.h
-@@ -48,6 +48,9 @@ class GIN_EXPORT ObjectTemplateBuilder {
+@@ -46,6 +46,9 @@ class GIN_EXPORT ObjectTemplateBuilder {
  public:
   explicit ObjectTemplateBuilder(v8::Isolate* isolate);
   ObjectTemplateBuilder(v8::Isolate* isolate, const char* type_name);
--- a/patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
+++ b/patches/chromium/feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch
@@ -317,10 +317,10 @@ index 7e17594c30ac3cf8cb484b53563b03fc75bd2e0b..0e4a68f2fd8179640f877cb258b40496
 
 // Although ScreenCaptureKit is available in 12.3 there were some bugs that
 diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
-index a5bc6f63c771fdf68ed9251285eac9d2c91acdc0..f719ff68e18093791bf13e434f40a3d1a9626dca 100644
+index cedd951a80e055a6af8aa17460d77e1b3e76fff3..997c239f337f5c049a75518809a56480a5abf9f3 100644
 --- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
 +++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
-@@ -321,8 +321,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(
+@@ -323,8 +323,16 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(
         break;
       }
 
@@ -338,7 +338,7 @@ index a5bc6f63c771fdf68ed9251285eac9d2c91acdc0..f719ff68e18093791bf13e434f40a3d1
         // For the other capturers, when a bug reports the type of capture it's
         // easy enough to determine which capturer was used, but it's a little
         // fuzzier with window capture.
-@@ -338,13 +346,15 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(
+@@ -340,13 +348,15 @@ void InProcessVideoCaptureDeviceLauncher::LaunchDeviceAsync(
       }
 #endif  // defined(USE_AURA) || BUILDFLAG(IS_MAC)
 
--- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
+++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
@@ -28,10 +28,10 @@ The patch should be removed in favor of either:
 Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.

 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index 24d2fc92266d1d398ee43e08a56cc05d9ff6eca3..748d041e518350f49c6aef88275893c19616d014 100644
+index 4288bf261741e4260b7a3117618fa19d39b20d2c..981aaaf9510d4354e02381266cf629a98c4d6ef6 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -11374,6 +11374,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
+@@ -11376,6 +11376,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
             target_rph_id);
   }
 
--- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
+++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
@@ -582,7 +582,7 @@ index 2d5cad5d7a4ab9292a5f966123687dee06f4512b..ae798fc8f923a9b590c0d9ed703946a2
   return kAttributes;
 }
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index adce27e6feaed7172cac9bdcd1b2e83930eb0a77..d912bdedc246503bb4114393baee14fc95c54eb9 100644
+index dfc54c87eabbb33277ed145e78f8eef592da9ea2..5024ea32655edd62c02565a5e9e1d802c348c663 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
@@ -345,6 +345,7 @@ source_set("browser") {
--- a/patches/chromium/revert_update_siso-chromium_image.patch
+++ b/patches/chromium/revert_update_siso-chromium_image.patch
@@ -1,103 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Fri, 27 Jun 2025 02:34:16 +0900
-Subject: Revert "update siso-chromium image"
-
-This reverts commit b36ef7a445fca58be9a2ebead68bfbda251667ff.
-
-Reason for revert:
-* Requires deployment of new container on our rbe cluster which cannot
-happen immediately due to siso transition.
-* Helps unblock the roller PRs.
-* Image bump was to remove i686 support which doesn't affect us
-https://chromium-review.googlesource.com/c/infra/infra/+/6664079
-
-diff --git a/build/config/siso/backend_config/google.star b/build/config/siso/backend_config/google.star
-index 31b3687d2925325259f33b07754680ba350e3059..348317edc26774168732aacb0fed110c4bbec552 100644
--- a/build/config/siso/backend_config/google.star
-+++ b/build/config/siso/backend_config/google.star
-@@ -7,7 +7,7 @@
- load("@builtin//struct.star", "module")
- 
- def __platform_properties(ctx):
-    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a"
-+    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b"
-     return {
-         "default": {
-             "OSFamily": "Linux",
-diff --git a/build/config/siso/backend_config/google_cros_chroot.star b/build/config/siso/backend_config/google_cros_chroot.star
-index 2763740c7a6b80cc689e745f9af1d7c7ed664d7d..ea1855d8823e4aa31acc920d295d56939efe624d 100644
--- a/build/config/siso/backend_config/google_cros_chroot.star
-+++ b/build/config/siso/backend_config/google_cros_chroot.star
-@@ -8,7 +8,7 @@ load("@builtin//struct.star", "module")
- 
- def __platform_properties(ctx):
-     # LINT.IfChange
-    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a"
-+    container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b"
- 
-     return {
-         "default": {
-diff --git a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg
-index ca8e84948679c7892534fbf793afcec887009c30..6f6e1ca9a0c1385b94aa3b46be5a0a143fc57835 100644
--- a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg
-@@ -1,4 +1,4 @@
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
- server_address=unix:///tmp/reproxy.sock
- labels=type=compile,compiler=clang,lang=cpp
- exec_strategy=racing
-diff --git a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg
-index d1ed4fe108a4b954e0f933d12e5308170f357548..12ae5379c2fe6ff2ae9473703730d87fdcc52b3f 100644
--- a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg
-@@ -1,4 +1,4 @@
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
- server_address=unix:///tmp/reproxy.sock
- labels=type=tool
- exec_strategy=remote_local_fallback
-diff --git a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg
-index c6c29e29031f38ef172468ade17fde29d648d85d..e73e2e6c7a1876678c547f0f686f817ef03bfd65 100644
--- a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg
-@@ -1,5 +1,5 @@
- # LINT.IfChange
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
- # LINT.ThenChange(/build/config/siso/backend_config/google_cros_chroot.star)
- server_address=unix:///tmp/reproxy.sock
- labels=type=compile,compiler=clang,lang=cpp
-diff --git a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg
-index 41279923537cc42505e9e47301afe0dec7095c05..918fc9cb47afc8ec8f6b7e060504da7108aa0f91 100644
--- a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg
-@@ -1,4 +1,4 @@
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
- server_address=unix:///tmp/reproxy.sock
- labels=type=tool
- exec_strategy=remote_local_fallback
-diff --git a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg
-index 237af4b723b7b269a97cdf57ecdf4a1cfcd0d76a..6eb61b9ac0d03a0983964d1334389e09d091f4d5 100644
--- a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg
-@@ -1,5 +1,5 @@
- # Configuration for the ChromeOS build using Chrome's bundled toolchain.
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
- server_address=unix:///tmp/reproxy.sock
- labels=type=compile,compiler=clang,lang=cpp
- exec_strategy=remote_local_fallback
-diff --git a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg
-index b2579800ff1ae44737c1aa8034923e060999c944..f8332cd84bbc495e161193cd242302c659748596 100644
--- a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg
-+++ b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg
-@@ -1,5 +1,5 @@
- # Configuration file for Python actions in the ChromeOS build.
-platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
-+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
- server_address=unix:///tmp/reproxy.sock
- labels=type=tool
- exec_strategy=remote_local_fallback
--- a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
+++ b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
@@ -10,10 +10,10 @@ on Windows.  We should refactor our code so that this patch isn't
 necessary.

 diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
-index 8d6d0963ac818a16ce63b41f61dd91325fd81c53..5f7449c93a9fd21838d6765e06ddd3362808d418 100644
+index e887bbb4792382d4aa2ceaed018c492e258d00fe..98f1270a3f74f9a1ce641f629e5ae6100fefec13 100644
 --- a/testing/variations/fieldtrial_testing_config.json
 +++ b/testing/variations/fieldtrial_testing_config.json
-@@ -24885,6 +24885,21 @@
+@@ -24897,6 +24897,21 @@
             ]
         }
     ],
--- a/script/actions/move-artifacts.sh
+++ b/script/actions/move-artifacts.sh
@@ -113,5 +113,8 @@ mv_if_exist src/out/Default/hunspell_dictionaries.zip
 mv_if_exist src/cross-arch-snapshots
 cp_if_exist src/out/electron_ninja_log
 cp_if_exist src/out/Default/.ninja_log
+if [ -n "$SISO_REPORT_PATH" ]; then
+  cp_if_exist "$SISO_REPORT_PATH"
+fi

 move_src_dirs_if_exist
--- a/script/add-debug-link.py
+++ b/script/add-debug-link.py
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import sys
-
-from lib.config import PLATFORM
-from lib.util import execute, get_linux_binaries, get_out_dir
-
-def add_debug_link_into_binaries(directory, target_cpu, debug_dir):
-  for binary in get_linux_binaries():
-    binary_path = os.path.join(directory, binary)
-    if os.path.isfile(binary_path):
-      add_debug_link_into_binary(binary_path, target_cpu, debug_dir)
-
-def add_debug_link_into_binary(binary_path, target_cpu, debug_dir):
-  if PLATFORM == 'linux' and target_cpu in ('x86', 'arm', 'arm64'):
-    # Skip because no objcopy binary on the given target.
-    return
-
-  debug_name = get_debug_name(binary_path)
-  # Make sure the path to the binary is not relative because of cwd param.
-  real_binary_path = os.path.realpath(binary_path)
-  cmd = ['objcopy', '--add-gnu-debuglink=' + debug_name, real_binary_path]
-  execute(cmd, cwd=debug_dir)
-
-def get_debug_name(binary_path):
-  return os.path.basename(binary_path) + '.debug'
-
-def main():
-  args = parse_args()
-  if args.file:
-    add_debug_link_into_binary(args.file, args.target_cpu, args.debug_dir)
-  else:
-    add_debug_link_into_binaries(args.directory, args.target_cpu,
-                                 args.debug_dir)
-
-def parse_args():
-  parser = argparse.ArgumentParser(description='Add debug link to binaries')
-  parser.add_argument('-d', '--directory',
-                      help='Path to the dir that contains files to add links',
-                      default=get_out_dir(),
-                      required=False)
-  parser.add_argument('-f', '--file',
-                      help='Path to a specific file to add debug link',
-                      required=False)
-  parser.add_argument('-s', '--debug-dir',
-                      help='Path to the dir that contain the debugs',
-                      default=None,
-                      required=True)
-  parser.add_argument('-v', '--verbose',
-                      action='store_true',
-                      help='Prints the output of the subprocesses')
-  parser.add_argument('--target-cpu',
-                      default='',
-                      required=False,
-                      help='Target cpu of binaries to add debug link')
-
-  return parser.parse_args()
-
-if __name__ == '__main__':
-  sys.exit(main())
--- a/script/copy-debug-symbols.py
+++ b/script/copy-debug-symbols.py
@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import sys
-
-from lib.config import PLATFORM
-from lib.util import execute, get_linux_binaries, get_out_dir, safe_mkdir
-
-# It has to be done before stripping the binaries.
-def copy_debug_from_binaries(directory, out_dir, target_cpu, compress):
-  for binary in get_linux_binaries():
-    binary_path = os.path.join(directory, binary)
-    if os.path.isfile(binary_path):
-      copy_debug_from_binary(binary_path, out_dir, target_cpu, compress)
-
-def copy_debug_from_binary(binary_path, out_dir, target_cpu, compress):
-  if PLATFORM == 'linux' and target_cpu in ('x86', 'arm', 'arm64'):
-    # Skip because no objcopy binary on the given target.
-    return
-  debug_name = get_debug_name(binary_path)
-  cmd = ['objcopy', '--only-keep-debug']
-  if compress:
-    cmd.extend(['--compress-debug-sections'])
-  cmd.extend([binary_path, os.path.join(out_dir, debug_name)])
-  execute(cmd)
-
-def get_debug_name(binary_path):
-  return os.path.basename(binary_path) + '.debug'
-
-def main():
-  args = parse_args()
-  safe_mkdir(args.out_dir)
-  if args.file:
-    copy_debug_from_binary(args.file, args.out_dir, args.target_cpu,
-                           args.compress)
-  else:
-    copy_debug_from_binaries(args.directory, args.out_dir, args.target_cpu,
-                             args.compress)
-
-def parse_args():
-  parser = argparse.ArgumentParser(description='Copy debug from binaries')
-  parser.add_argument('-d', '--directory',
-                      help='Path to the dir that contains files to copy',
-                      default=get_out_dir(),
-                      required=False)
-  parser.add_argument('-f', '--file',
-                      help='Path to a specific file to copy debug symbols',
-                      required=False)
-  parser.add_argument('-o', '--out-dir',
-                      help='Path to the dir that will contain the debugs',
-                      default=None,
-                      required=True)
-  parser.add_argument('-v', '--verbose',
-                      action='store_true',
-                      help='Prints the output of the subprocesses')
-  parser.add_argument('--target-cpu',
-                      default='',
-                      required=False,
-                      help='Target cpu of binaries to copy debug symbols')
-  parser.add_argument('--compress',
-                      action='store_true',
-                      required=False,
-                      help='Compress the debug symbols')
-
-  return parser.parse_args()
-
-if __name__ == '__main__':
-  sys.exit(main())
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -207,14 +207,3 @@ def get_depot_tools_executable(name):
  if sys.platform == 'win32':
    path += '.bat'
  return path
-
-def get_linux_binaries():
-  return [
-    'chrome-sandbox',
-    'chrome_crashpad_handler',
-    get_electron_branding()['project_name'],
-    'libEGL.so',
-    'libGLESv2.so',
-    'libffmpeg.so',
-    'libvk_swiftshader.so',
-  ]
--- a/script/node/generate_original_fs.py
+++ b/script/node/generate_original_fs.py
@@ -16,10 +16,6 @@ for fs_file in fs_files:
                'lib/original-fs.js').replace('lib/fs/',
                'lib/original-fs/')

-        with open(os.path.join(out_dir, fs_file), 'w', encoding='utf-8'
-                  ) as original_f:
-            original_f.write(contents)
-
        with open(os.path.join(out_dir, original_fs_file), 'w',
                  encoding='utf-8') as transformed_f:
            transformed_contents = contents.replace('internal/fs/',
--- a/script/strip-binaries.py
+++ b/script/strip-binaries.py
@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import sys
-
-from lib.config import set_verbose_mode, is_verbose_mode, verbose_mode_print
-from lib.util import execute, get_linux_binaries, get_out_dir
-
-def get_size(path):
-  size = os.path.getsize(path)
-  units = ["bytes", "KB", "MB", "GB"]
-  for unit in units:
-    if size < 1024:
-      return f"{size:.2f} {unit}"
-    size /= 1024
-  raise ValueError("File size is too large to be processed")
-
-def strip_binaries(directory, target_cpu):
-  if not os.path.isdir(directory):
-    verbose_mode_print('Directory ' + directory + ' does not exist.')
-    return
-
-  verbose_mode_print('Stripping binaries in ' + directory)
-  for binary in get_linux_binaries():
-    verbose_mode_print('\nStripping ' + binary)
-    binary_path = os.path.join(directory, binary)
-    if os.path.isfile(binary_path):
-      strip_binary(binary_path, target_cpu)
-
-def strip_binary(binary_path, target_cpu):
-  if target_cpu == 'arm':
-    strip = 'arm-linux-gnueabihf-strip'
-  elif target_cpu == 'arm64':
-    strip = 'aarch64-linux-gnu-strip'
-  else:
-    strip = 'strip'
-  
-  strip_args = [strip,
-                '--discard-all',
-                '--strip-debug',
-                '--preserve-dates',
-                binary_path]
-  if (is_verbose_mode()):
-    strip_args.insert(1, '--verbose')
-  verbose_mode_print('Binary size before stripping: ' + 
-                     str(get_size(binary_path)))
-  execute(strip_args)
-  verbose_mode_print('Binary size after stripping: ' +
-                     str(get_size(binary_path)))
-
-def main():
-  args = parse_args()
-  set_verbose_mode(args.verbose)
-  if args.file:
-    strip_binary(args.file, args.target_cpu)
-  else:
-    strip_binaries(args.directory, args.target_cpu)
-
-def parse_args():
-  parser = argparse.ArgumentParser(description='Strip linux binaries')
-  parser.add_argument('-d', '--directory',
-                      help='Path to the dir that contains files to strip.',
-                      default=get_out_dir(),
-                      required=False)
-  parser.add_argument('-f', '--file',
-                      help='Path to a specific file to strip.',
-                      required=False)
-  parser.add_argument('-v', '--verbose',
-                      default=False,
-                      action='store_true',
-                      help='Prints the output of the subprocesses')
-  parser.add_argument('--target-cpu',
-                      default='',
-                      required=False,
-                      help='Target cpu of binaries to strip')
-
-  return parser.parse_args()
-
-if __name__ == '__main__':
-  sys.exit(main())
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -324,11 +324,6 @@ bool NativeWindowViews::PreHandleMSG(UINT message,

      return false;
    }
-    case WM_RBUTTONUP: {
-      if (!has_frame())
-        electron::api::WebContents::SetDisableDraggableRegions(false);
-      return false;
-    }
    case WM_GETMINMAXINFO: {
      WINDOWPLACEMENT wp;
      wp.length = sizeof(WINDOWPLACEMENT);
--- a/shell/browser/ui/message_box_win.cc
+++ b/shell/browser/ui/message_box_win.cc
@@ -160,6 +160,7 @@ DialogResult ShowTaskDialogWstr(gfx::AcceleratedWidget parent,

  if (parent) {
    config.hwndParent = parent;
+    config.dwFlags |= TDF_POSITION_RELATIVE_TO_WINDOW;
  }

  if (default_id > 0)
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -142,6 +142,7 @@ bool ElectronDesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
    if (prevent_default) {
      electron::api::WebContents::SetDisableDraggableRegions(true);
      views::DesktopWindowTreeHostWin::HandleMouseEvent(event);
+      electron::api::WebContents::SetDisableDraggableRegions(false);
    }
    return prevent_default;
  }
--- a/shell/common/api/electron_bindings.cc
+++ b/shell/common/api/electron_bindings.cc
@@ -183,8 +183,11 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
 #endif
  dict.Set("free", free);

+#if BUILDFLAG(IS_MAC)
+  dict.Set("fileBacked", mem_info.file_backed);
+  dict.Set("purgeable", mem_info.purgeable);
+#else
  // NB: These return bogus values on macOS
-#if !BUILDFLAG(IS_MAC)
  dict.Set("swapTotal", mem_info.swap_total);
  dict.Set("swapFree", mem_info.swap_free);
 #endif
Author	SHA1	Message	Date
trop[bot]	d5907878bc	fix: showMessageDialog should center dialog to parent (#48215 ) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>	2025-09-01 14:56:47 -07:00
trop[bot]	0098160f2a	fix: ensure dragging works again after emitting contextmenu event (#48224 ) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>	2025-08-29 13:15:17 -04:00
electron-roller[bot]	207f64fec8	chore: bump chromium to 140.0.7339.41 (38-x-y) (#48190 ) * chore: bump chromium in DEPS to 140.0.7339.41 * chore: update patches * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>	2025-08-28 16:39:10 -04:00
BILL SHEN	441cff700b	feat: add `fileBacked` and `purgeable` fields to `process.getSystemMemoryInfo()` for macOS (#48146 ) feat: add fileBacked and purgeable fields to process.getSystemMemoryInfo() for macOS	2025-08-28 10:57:06 -07:00
trop[bot]	9eede35fc1	build: refactor Linux binary stripping to align with upstream (#48197 ) build: refactor Linux binary stripping to align with upstream (#47932) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>	2025-08-28 10:51:07 -07:00
trop[bot]	6812b13161	docs: fix some module headings (#48195 ) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Erick Zhao <ezhao@slack-corp.com>	2025-08-28 10:25:13 +02:00
trop[bot]	a64175ff1c	ci: use free GH arm runners (#48187 ) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>	2025-08-27 15:44:58 -04:00
trop[bot]	b34e618285	docs: add release timeline for Electron 39 (#48176 ) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org>	2025-08-26 15:08:31 -07:00
trop[bot]	818743493d	build: use siso instead of reclient (#48154 ) * build: use siso instead of reclient Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> * build: remove no longer needed arg for siso * build: fix ffmpeg build with siso --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>	2025-08-25 16:46:51 -04:00