remove decorateURL from default_app

The needs-signed-commits label was previously added by the lightweight
synchronize workflow but only removed by a job in build.yml gated on
`gha-done`, which requires every macOS/Linux/Windows build to finish
green. That made label removal both slow (waits on the full pipeline)
and fragile (any unrelated build failure leaves the label pinned even
after commits are properly signed).

Drop the `if` guard on the synchronize job so it re-evaluates signing
on every push, and add a removal step that runs on success when the
label is present. Force-pushing signed commits now clears the label as
soon as the check completes, with no dependency on the build pipeline.

.github/workflows/build.yml

@@ -442,34 +442,7 @@ jobs:
       contents: read
     needs: [docs-only, macos-x64, macos-arm64, linux-x64, linux-x64-asan, linux-arm, linux-arm64, windows-x64, windows-x86, windows-arm64]
     if: always() && github.repository == 'electron/electron' && !contains(needs.*.result, 'failure')
-    steps: 
+    steps:
     - name: GitHub Actions Jobs Done
       run: |
         echo "All GitHub Actions Jobs are done"
-
-  check-signed-commits:
-    name: Check signed commits in green PR
-    needs: gha-done
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'needs-signed-commits')}}
-    runs-on: ubuntu-slim
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Check signed commits in PR
-        uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52 # v1
-        with:
-          comment: |
-            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification) 
-            for all incoming PRs. To get your PR merged, please sign those commits 
-            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch 
-            (`git push --force-with-lease`)
-
-            For more information on signing commits, see GitHub's documentation on [Telling Git about your signing key](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key).
-
-      - name: Remove needs-signed-commits label
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $PR_URL --remove-label needs-signed-commits

.github/workflows/pull-request-opened-synchronized.yml

@@ -13,7 +13,6 @@ permissions: {}
 jobs:
   check-signed-commits:
     name: Check signed commits in PR
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'needs-signed-commits')}}
     runs-on: ubuntu-slim
     permissions:
       contents: read
@@ -23,9 +22,9 @@ jobs:
         uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52 # v1
         with:
           comment: |
-            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification) 
-            for all incoming PRs. To get your PR merged, please sign those commits 
-            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch 
+            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification)
+            for all incoming PRs. To get your PR merged, please sign those commits
+            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch
             (`git push --force-with-lease`)
 
             For more information on signing commits, see GitHub's documentation on [Telling Git about your signing key](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key).
@@ -37,3 +36,11 @@ jobs:
           PR_URL: ${{ github.event.pull_request.html_url }}
         run: |
           gh pr edit $PR_URL --add-label needs-signed-commits
+
+      - name: Remove needs-signed-commits label
+        if: ${{ success() && contains(github.event.pull_request.labels.*.name, 'needs-signed-commits') }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: |
+          gh pr edit $PR_URL --remove-label needs-signed-commits

default_app/default_app.ts

@@ -11,13 +11,6 @@ app.on('window-all-closed', () => {
   app.quit();
 });
 
-function decorateURL (url: string) {
-  // safely add `?utm_source=default_app
-  const parsedUrl = new URL(url);
-  parsedUrl.searchParams.append('utm_source', 'default_app');
-  return parsedUrl.toString();
-}
-
 // Find the shortest path to the electron binary
 const absoluteElectronPath = process.execPath;
 const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath);
@@ -69,7 +62,7 @@ async function createWindow (backgroundColor?: string) {
   mainWindow.on('ready-to-show', () => mainWindow!.show());
 
   mainWindow.webContents.setWindowOpenHandler(details => {
-    shell.openExternal(decorateURL(details.url));
+    shell.openExternal(details.url);
     return { action: 'deny' };
   });
 

package.json

@@ -21,7 +21,7 @@
     "@types/semver": "^7.5.8",
     "@types/stream-json": "^1.7.8",
     "@types/temp": "^0.9.4",
-    "@xmldom/xmldom": "^0.8.11",
+    "@xmldom/xmldom": "^0.8.12",
     "buffer": "^6.0.3",
     "chalk": "^4.1.0",
     "check-for-leaks": "^1.2.1",

patches/chromium/.patches

@@ -125,7 +125,6 @@ feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
 fix_win32_synchronous_spellcheck.patch
 chore_grandfather_in_electron_views_and_delegates.patch
 refactor_patch_electron_permissiontypes_into_blink.patch
-revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
 fix_add_macos_memory_query_fallback_to_avoid_crash.patch
 fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
 feat_add_support_for_embedder_snapshot_validation.patch

patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch

@@ -8,10 +8,10 @@ such as the background turning black when maximizing the window and
 dynamic background material settings not taking effect.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index d1e06b675b19226cf3b78e1aada8d8f2d684fada..ce810555b8501797643987916a728cad8f5adaa5 100644
+index e4da40256ce94d6a0896792a8ef2faa18e1fa5d2..3a5833fcc018f32e86c0a95a42937fb9ac6c5a40 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -184,6 +184,10 @@ void DesktopWindowTreeHostWin::FinishTouchDrag(gfx::Point screen_point) {
+@@ -167,6 +167,10 @@ void DesktopWindowTreeHostWin::FinishTouchDrag(gfx::Point screen_point) {
    }
  }
  
@@ -23,7 +23,7 @@ index d1e06b675b19226cf3b78e1aada8d8f2d684fada..ce810555b8501797643987916a728cad
  
  void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index a40bd9f25fa07a553c011cf19f155f8158f4ae5f..ae2baec731b5fcd8be97f2177d23b860d67ab8bc 100644
+index 27322ef34edf3fa8bfbd20b1baddcaf3b7555618..b8d1fa863fd05ebc3ab8ac5ef8c4d81361ce45fe 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 @@ -93,6 +93,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin

patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch

@@ -1,285 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: John Kleinschmidt <jkleinsc@electronjs.org>
-Date: Sat, 14 Jun 2025 16:21:07 -0400
-Subject: Revert "[views] Remove DesktopWindowTreeHostWin::window_enlargement_"
-
-This reverts commit 1771dbae6961e7bb7c22bbc6c77f84d90ef2be46.
-
-Electron needs this patch to allow windows smaller than 64x64
-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 988866d79a5d1dbd366ebdbff0e8eb2c0c498168..5761ac48be0a64618be0a94606149dd944e46e27 100644
---- a/testing/variations/fieldtrial_testing_config.json
-+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -22626,6 +22626,21 @@
-             ]
-         }
-     ],
-+    "TransparentHwndEnlargement": [
-+        {
-+            "platforms": [
-+                "windows"
-+            ],
-+            "experiments": [
-+                {
-+                    "name": "DisableTransparentHwndEnlargement",
-+                    "disable_features": [
-+                        "EnableTransparentHwndEnlargement"
-+                    ]
-+                }
-+            ]
-+        }
-+    ],
-     "TransportSecurityFileWriterScheduleAndroid": [
-         {
-             "platforms": [
-diff --git a/ui/views/views_features.cc b/ui/views/views_features.cc
-index 47077e16870889ef8f8c8b2adf58015bd5aff7fa..ba59e6e1609e61579bf49aca095490b083d72051 100644
---- a/ui/views/views_features.cc
-+++ b/ui/views/views_features.cc
-@@ -30,6 +30,14 @@ BASE_FEATURE(kEnableInputProtection, base::FEATURE_DISABLED_BY_DEFAULT);
- // crbug.com/370856871.
- BASE_FEATURE(kEnableTouchDragCursorSync, base::FEATURE_ENABLED_BY_DEFAULT);
- 
-+// Enables enlargement of HWNDs to a minimum size of 64x64 to handle reported
-+// graphical glitches on certain hardware.
-+// TODO(crbug.com/401996981): Remove this once enlargement is confirmed to no
-+// longer be needed.
-+BASE_FEATURE(kEnableTransparentHwndEnlargement,
-+             "EnableTransparentHwndEnlargement",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- // Used to enable keyboard-accessible tooltips in Views UI, as opposed
- // to kKeyboardAccessibleTooltip in //ui/base/ui_base_features.cc.
- BASE_FEATURE(kKeyboardAccessibleTooltipInViews,
-diff --git a/ui/views/views_features.h b/ui/views/views_features.h
-index 888a16fb6213eceb131ae636dc643d7f2d5bcad9..6077412165081cd4abeaf0b061feb2f795ee8131 100644
---- a/ui/views/views_features.h
-+++ b/ui/views/views_features.h
-@@ -15,6 +15,7 @@ namespace views::features {
- VIEWS_EXPORT BASE_DECLARE_FEATURE(kApplyInitialUrlToWebContents);
- VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnableInputProtection);
- VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnableTouchDragCursorSync);
-+VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnableTransparentHwndEnlargement);
- VIEWS_EXPORT BASE_DECLARE_FEATURE(kKeyboardAccessibleTooltipInViews);
- 
- }  // namespace views::features
-diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index e4da40256ce94d6a0896792a8ef2faa18e1fa5d2..d1e06b675b19226cf3b78e1aada8d8f2d684fada 100644
---- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -85,6 +85,23 @@ namespace {
- // This constant controls how many pixels wide that border is.
- const int kMouseCaptureRegionBorder = 5;
- 
-+gfx::Size GetExpandedWindowSize(bool is_translucent, gfx::Size size) {
-+  if (!base::FeatureList::IsEnabled(
-+          features::kEnableTransparentHwndEnlargement) ||
-+      !is_translucent) {
-+    return size;
-+  }
-+
-+  // Some AMD drivers can't display windows that are less than 64x64 pixels,
-+  // so expand them to be at least that size. http://crbug.com/286609
-+  gfx::Size expanded(std::max(size.width(), 64), std::max(size.height(), 64));
-+  return expanded;
-+}
-+
-+void InsetBottomRight(gfx::Rect* rect, const gfx::Vector2d& vector) {
-+  rect->Inset(gfx::Insets::TLBR(0, 0, vector.y(), vector.x()));
-+}
-+
- // Updates the cursor clip region. Used for mouse locking.
- void UpdateMouseLockRegion(aura::Window* window, bool locked) {
-   if (!locked) {
-@@ -342,9 +359,14 @@ bool DesktopWindowTreeHostWin::IsVisible() const {
- }
- 
- void DesktopWindowTreeHostWin::SetSize(const gfx::Size& size) {
--  const gfx::Size size_in_pixels =
-+  gfx::Size size_in_pixels =
-       display::win::GetScreenWin()->DIPToScreenSize(GetHWND(), size);
--  message_handler_->SetSize(size_in_pixels);
-+  gfx::Size expanded =
-+      GetExpandedWindowSize(message_handler_->is_translucent(), size_in_pixels);
-+  window_enlargement_ =
-+      gfx::Vector2d(expanded.width() - size_in_pixels.width(),
-+                    expanded.height() - size_in_pixels.height());
-+  message_handler_->SetSize(expanded);
- }
- 
- void DesktopWindowTreeHostWin::StackAbove(aura::Window* window) {
-@@ -359,30 +381,40 @@ void DesktopWindowTreeHostWin::StackAtTop() {
- }
- 
- void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) {
--  const gfx::Size size_in_pixels =
-+  gfx::Size size_in_pixels =
-       display::win::GetScreenWin()->DIPToScreenSize(GetHWND(), size);
--  message_handler_->CenterWindow(size_in_pixels);
-+  gfx::Size expanded_size;
-+  expanded_size =
-+      GetExpandedWindowSize(message_handler_->is_translucent(), size_in_pixels);
-+  window_enlargement_ =
-+      gfx::Vector2d(expanded_size.width() - size_in_pixels.width(),
-+                    expanded_size.height() - size_in_pixels.height());
-+  message_handler_->CenterWindow(expanded_size);
- }
- 
- void DesktopWindowTreeHostWin::GetWindowPlacement(
-     gfx::Rect* bounds,
-     ui::mojom::WindowShowState* show_state) const {
-   message_handler_->GetWindowPlacement(bounds, show_state);
-+  InsetBottomRight(bounds, window_enlargement_);
-   *bounds = display::win::GetScreenWin()->ScreenToDIPRect(GetHWND(), *bounds);
- }
- 
- gfx::Rect DesktopWindowTreeHostWin::GetWindowBoundsInScreen() const {
-   gfx::Rect pixel_bounds = message_handler_->GetWindowBoundsInScreen();
-+  InsetBottomRight(&pixel_bounds, window_enlargement_);
-   return display::win::GetScreenWin()->ScreenToDIPRect(GetHWND(), pixel_bounds);
- }
- 
- gfx::Rect DesktopWindowTreeHostWin::GetClientAreaBoundsInScreen() const {
-   gfx::Rect pixel_bounds = message_handler_->GetClientAreaBoundsInScreen();
-+  InsetBottomRight(&pixel_bounds, window_enlargement_);
-   return display::win::GetScreenWin()->ScreenToDIPRect(GetHWND(), pixel_bounds);
- }
- 
- gfx::Rect DesktopWindowTreeHostWin::GetRestoredBounds() const {
-   gfx::Rect pixel_bounds = message_handler_->GetRestoredBounds();
-+  InsetBottomRight(&pixel_bounds, window_enlargement_);
-   return display::win::GetScreenWin()->ScreenToDIPRect(GetHWND(), pixel_bounds);
- }
- 
-@@ -701,37 +733,44 @@ void DesktopWindowTreeHostWin::HideImpl() {
- // other get/set methods work in DIP.
- 
- gfx::Rect DesktopWindowTreeHostWin::GetBoundsInPixels() const {
--  const gfx::Rect bounds_px(message_handler_->GetClientAreaBounds());
-+  gfx::Rect bounds(message_handler_->GetClientAreaBounds());
-   // If the window bounds were expanded we need to return the original bounds
-   // To achieve this we do the reverse of the expansion, i.e. add the
-   // window_expansion_top_left_delta_ to the origin and subtract the
-   // window_expansion_bottom_right_delta_ from the width and height.
--  const gfx::Rect without_expansion_bounds_px(
--      bounds_px.x() + window_expansion_top_left_delta_.x(),
--      bounds_px.y() + window_expansion_top_left_delta_.y(),
--      bounds_px.width() - window_expansion_bottom_right_delta_.x(),
--      bounds_px.height() - window_expansion_bottom_right_delta_.y());
--  return without_expansion_bounds_px;
-+  gfx::Rect without_expansion(
-+      bounds.x() + window_expansion_top_left_delta_.x(),
-+      bounds.y() + window_expansion_top_left_delta_.y(),
-+      bounds.width() - window_expansion_bottom_right_delta_.x() -
-+          window_enlargement_.x(),
-+      bounds.height() - window_expansion_bottom_right_delta_.y() -
-+          window_enlargement_.y());
-+  return without_expansion;
- }
- 
--void DesktopWindowTreeHostWin::SetBoundsInPixels(
--    const gfx::Rect& bounds_in_pixels) {
-+void DesktopWindowTreeHostWin::SetBoundsInPixels(const gfx::Rect& bounds) {
-   // If the window bounds have to be expanded we need to subtract the
-   // window_expansion_top_left_delta_ from the origin and add the
-   // window_expansion_bottom_right_delta_ to the width and height
--  const gfx::Size old_content_size_px = GetBoundsInPixels().size();
--
--  const gfx::Rect expanded_bounds_px(
--      bounds_in_pixels.x() - window_expansion_top_left_delta_.x(),
--      bounds_in_pixels.y() - window_expansion_top_left_delta_.y(),
--      bounds_in_pixels.width() + window_expansion_bottom_right_delta_.x(),
--      bounds_in_pixels.height() + window_expansion_bottom_right_delta_.y());
--
--  // When `expanded_bounds_px` causes the window to be moved to a display with a
-+  gfx::Size old_content_size = GetBoundsInPixels().size();
-+
-+  gfx::Rect expanded(
-+      bounds.x() - window_expansion_top_left_delta_.x(),
-+      bounds.y() - window_expansion_top_left_delta_.y(),
-+      bounds.width() + window_expansion_bottom_right_delta_.x(),
-+      bounds.height() + window_expansion_bottom_right_delta_.y());
-+
-+  gfx::Rect new_expanded(
-+      expanded.origin(),
-+      GetExpandedWindowSize(message_handler_->is_translucent(),
-+                            expanded.size()));
-+  window_enlargement_ =
-+      gfx::Vector2d(new_expanded.width() - expanded.width(),
-+                    new_expanded.height() - expanded.height());
-+  // When |new_expanded| causes the window to be moved to a display with a
-   // different DSF, HWNDMessageHandler::OnDpiChanged() will be called and the
-   // window size will be scaled automatically.
--  message_handler_->SetBounds(expanded_bounds_px,
--                              old_content_size_px != bounds_in_pixels.size());
-+  message_handler_->SetBounds(new_expanded, old_content_size != bounds.size());
- }
- 
- gfx::Rect
-@@ -943,18 +982,26 @@ int DesktopWindowTreeHostWin::GetNonClientComponent(
- 
- void DesktopWindowTreeHostWin::GetWindowMask(const gfx::Size& size_px,
-                                              SkPath* path) {
--  Widget* widget = GetWidget();
--  if (!widget || !widget->non_client_view()) {
--    return;
--  }
-+  // Request the window mask for hwnd of `size_px`. The hwnd size must be
-+  // adjusted by `window_enlargement` to return to the client-expected window
-+  // size (see crbug.com/41047830).
-+  const gfx::Size adjusted_size_in_px =
-+      size_px - gfx::Size(window_enlargement_.x(), window_enlargement_.y());
- 
--  widget->non_client_view()->GetWindowMask(
--      display::win::GetScreenWin()->ScreenToDIPSize(GetHWND(), size_px), path);
--  // Convert path in DIPs to pixels.
--  if (!path->isEmpty()) {
--    const float scale =
--        display::win::GetScreenWin()->GetScaleFactorForHWND(GetHWND());
--    *path = path->makeTransform(SkMatrix::Scale(scale, scale));
-+  if (Widget* widget = GetWidget(); widget && widget->non_client_view()) {
-+    widget->non_client_view()->GetWindowMask(
-+        display::win::GetScreenWin()->ScreenToDIPSize(GetHWND(),
-+                                                      adjusted_size_in_px),
-+        path);
-+    // Convert path in DIPs to pixels.
-+    if (!path->isEmpty()) {
-+      const float scale =
-+          display::win::GetScreenWin()->GetScaleFactorForHWND(GetHWND());
-+      *path = path->makeTransform(SkMatrix::Scale(scale, scale));
-+    }
-+  } else if (!window_enlargement_.IsZero()) {
-+    *path = SkPath::Rect(SkRect::MakeXYWH(0, 0, adjusted_size_in_px.width(),
-+                                          adjusted_size_in_px.height()));
-   }
- }
- 
-diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 27322ef34edf3fa8bfbd20b1baddcaf3b7555618..a40bd9f25fa07a553c011cf19f155f8158f4ae5f 100644
---- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-@@ -175,7 +175,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
-   void ShowImpl() override;
-   void HideImpl() override;
-   gfx::Rect GetBoundsInPixels() const override;
--  void SetBoundsInPixels(const gfx::Rect& bounds_in_pixels) override;
-+  void SetBoundsInPixels(const gfx::Rect& bounds) override;
-   gfx::Rect GetBoundsInAcceleratedWidgetPixelCoordinates() override;
-   gfx::Point GetLocationOnScreenInPixels() const override;
-   void SetCapture() override;
-@@ -330,6 +330,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
-   gfx::Vector2d window_expansion_top_left_delta_;
-   gfx::Vector2d window_expansion_bottom_right_delta_;
- 
-+  // Windows are enlarged to be at least 64x64 pixels, so keep track of the
-+  // extra added here.
-+  // TODO(crbug.com/401996981): This is likely no longer necessary and should be
-+  // removed.
-+  gfx::Vector2d window_enlargement_;
-+
-   // Whether the window close should be converted to a hide, and then actually
-   // closed on the completion of the hide animation. This is cached because
-   // the property is set on the contained window which has a shorter lifetime.

script/node/generate_node_headers.py

@@ -8,7 +8,9 @@ from pathlib import Path
 
 SRC_DIR = Path(__file__).resolve().parents[3]
 sys.path.append(os.path.join(SRC_DIR, 'third_party/electron_node/tools'))
+sys.path.append(str(Path(__file__).resolve().parents[1]))  # electron/script/
 
+from lib.util import get_out_dir
 import install
 
 class LoadPythonDictionaryError(Exception):
@@ -31,13 +33,6 @@ def LoadPythonDictionary(path):
             )
         return file_data
 
-def get_out_dir():
-    out_dir = 'Testing'
-    override = os.environ.get('ELECTRON_OUT_DIR')
-    if override is not None:
-        out_dir = override
-    return os.path.join(SRC_DIR, 'out', out_dir)
-
 if __name__ == '__main__':
     node_root_dir = os.path.join(SRC_DIR, 'third_party/electron_node')
     out = {}

shell/browser/api/electron_api_web_contents.cc

@@ -2315,16 +2315,9 @@ void WebContents::DevToolsOpened() {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
   v8::HandleScope handle_scope(isolate);
   DCHECK(inspectable_web_contents_);
-
-  // GetDevToolsWebContents() can be null here when DevTools were closed
-  // re-entrantly during InspectableWebContents::LoadCompleted() — e.g. when
-  // a JS handler for `devtools-focused` (fired from the activate path inside
-  // SetIsDocked) calls closeDevTools() before LoadCompleted finishes.
-  content::WebContents* const dtwc = GetDevToolsWebContents();
-  if (!dtwc)
-    return;
-
-  auto handle = FromOrCreate(isolate, dtwc);
+  DCHECK(inspectable_web_contents_->GetDevToolsWebContents());
+  auto handle = FromOrCreate(
+      isolate, inspectable_web_contents_->GetDevToolsWebContents());
   devtools_web_contents_.Reset(isolate, handle.ToV8());
 
   // Set inspected tabID.
@@ -2332,11 +2325,12 @@ void WebContents::DevToolsOpened() {
       "DevToolsAPI", "setInspectedTabId", base::Value(ID()));
 
   // Inherit owner window in devtools when it doesn't have one.
-  bool has_window = dtwc->GetUserData(NativeWindowRelay::UserDataKey());
-  if (owner_window_ && !has_window) {
-    DCHECK(!owner_window_.WasInvalidated());
+  auto* devtools = inspectable_web_contents_->GetDevToolsWebContents();
+  bool has_window = devtools->GetUserData(NativeWindowRelay::UserDataKey());
+  if (owner_window() && !has_window) {
+    CHECK(!owner_window_.WasInvalidated());
     DCHECK_EQ(handle->owner_window(), nullptr);
-    handle->SetOwnerWindow(dtwc, owner_window());
+    handle->SetOwnerWindow(devtools, owner_window());
   }
 
   Emit("devtools-opened");
@@ -2895,8 +2889,8 @@ v8::Local<v8::Promise> WebContents::SavePage(
     return handle;
   }
 
-  auto* handler = new SavePageHandler(web_contents(), std::move(promise));
-  handler->Handle(full_file_path, save_type);
+  auto* handler = new SavePageHandler{std::move(promise)};
+  handler->Handle(full_file_path, save_type, web_contents());
 
   return handle;
 }
@@ -3022,7 +3016,7 @@ void WebContents::InspectElement(int x, int y) {
   if (!enable_devtools_ || !inspectable_web_contents_)
     return;
 
-  if (!GetDevToolsWebContents())
+  if (!inspectable_web_contents_->GetDevToolsWebContents())
     OpenDevTools(nullptr);
   inspectable_web_contents_->InspectElement(x, y);
 }

shell/browser/api/save_page_handler.cc

@@ -12,9 +12,8 @@
 
 namespace electron::api {
 
-SavePageHandler::SavePageHandler(content::WebContents* web_contents,
-                                 gin_helper::Promise<void> promise)
-    : web_contents_(web_contents), promise_(std::move(promise)) {}
+SavePageHandler::SavePageHandler(gin_helper::Promise<void> promise)
+    : promise_{std::move(promise)} {}
 
 SavePageHandler::~SavePageHandler() = default;
 
@@ -26,9 +25,10 @@ void SavePageHandler::OnDownloadCreated(content::DownloadManager* manager,
 }
 
 bool SavePageHandler::Handle(const base::FilePath& full_path,
-                             const content::SavePageType& save_type) {
+                             const content::SavePageType& save_type,
+                             content::WebContents* web_contents) {
   auto* download_manager =
-      web_contents_->GetBrowserContext()->GetDownloadManager();
+      web_contents->GetBrowserContext()->GetDownloadManager();
   download_manager->AddObserver(this);
   // Chromium will create a 'foo_files' directory under the directory of saving
   // page 'foo.html' for holding other resource files of 'foo.html'.
@@ -36,7 +36,7 @@ bool SavePageHandler::Handle(const base::FilePath& full_path,
       full_path.RemoveExtension().BaseName().value() +
       FILE_PATH_LITERAL("_files"));
   bool result =
-      web_contents_->SavePage(full_path, saved_main_directory_path, save_type);
+      web_contents->SavePage(full_path, saved_main_directory_path, save_type);
   download_manager->RemoveObserver(this);
   // If initialization fails which means fail to create |DownloadItem|, we need
   // to delete the |SavePageHandler| instance to avoid memory-leak.

shell/browser/api/save_page_handler.h

@@ -5,7 +5,6 @@
 #ifndef ELECTRON_SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
 #define ELECTRON_SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
 
-#include "base/memory/raw_ptr.h"
 #include "components/download/public/common/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/save_page_type.h"
@@ -26,12 +25,12 @@ namespace electron::api {
 class SavePageHandler : private content::DownloadManager::Observer,
                         private download::DownloadItem::Observer {
  public:
-  SavePageHandler(content::WebContents* web_contents,
-                  gin_helper::Promise<void> promise);
+  explicit SavePageHandler(gin_helper::Promise<void> promise);
   ~SavePageHandler() override;
 
   bool Handle(const base::FilePath& full_path,
-              const content::SavePageType& save_type);
+              const content::SavePageType& save_type,
+              content::WebContents* web_contents);
 
  private:
   void Destroy(download::DownloadItem* item);
@@ -43,7 +42,6 @@ class SavePageHandler : private content::DownloadManager::Observer,
   // download::DownloadItem::Observer:
   void OnDownloadUpdated(download::DownloadItem* item) override;
 
-  raw_ptr<content::WebContents> web_contents_;  // weak
   gin_helper::Promise<void> promise_;
 };
 

shell/browser/electron_browser_client.cc

@@ -63,6 +63,7 @@
 #include "mojo/public/cpp/bindings/self_owned_associated_receiver.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_private_key.h"
+#include "pdf/pdf_features.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/device/public/cpp/geolocation/geolocation_system_permission_manager.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
@@ -1591,6 +1592,46 @@ bool ElectronBrowserClient::ShouldEnableStrictSiteIsolation() {
   return true;
 }
 
+bool ElectronBrowserClient::ShouldEnableSubframeZoom() {
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+  return chrome_pdf::features::IsOopifPdfEnabled();
+#else
+  return false;
+#endif
+}
+
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+std::optional<network::CrossOriginEmbedderPolicy>
+ElectronBrowserClient::MaybeOverrideLocalURLCrossOriginEmbedderPolicy(
+    content::NavigationHandle* navigation_handle) {
+  if (!chrome_pdf::features::IsOopifPdfEnabled() ||
+      !navigation_handle->IsPdf()) {
+    return std::nullopt;
+  }
+
+  content::RenderFrameHost* pdf_extension = navigation_handle->GetParentFrame();
+  if (!pdf_extension) {
+    return std::nullopt;
+  }
+
+  content::RenderFrameHost* pdf_embedder = pdf_extension->GetParent();
+  CHECK(pdf_embedder);
+  return pdf_embedder->GetCrossOriginEmbedderPolicy();
+}
+#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
+
+bool ElectronBrowserClient::DoesSiteRequireDedicatedProcess(
+    content::BrowserContext* browser_context,
+    const GURL& effective_site_url) {
+#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
+  return GetEnabledExtensionFromEffectiveURL(browser_context,
+                                             effective_site_url) != nullptr;
+#else
+  return content::ContentBrowserClient::DoesSiteRequireDedicatedProcess(
+      browser_context, effective_site_url);
+#endif
+}
+
 void ElectronBrowserClient::BindHostReceiverForRenderer(
     content::RenderProcessHost* render_process_host,
     mojo::GenericPendingReceiver receiver) {

shell/browser/electron_browser_client.h

@@ -30,6 +30,7 @@ class FilePath;
 
 namespace content {
 class ClientCertificateDelegate;
+class NavigationHandle;
 class PlatformNotificationService;
 class NavigationThrottleRegistry;
 class QuotaPermissionContext;
@@ -82,6 +83,14 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   // content::ContentBrowserClient:
   std::string GetApplicationLocale() override;
   bool ShouldEnableStrictSiteIsolation() override;
+  bool ShouldEnableSubframeZoom() override;
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+  std::optional<network::CrossOriginEmbedderPolicy>
+  MaybeOverrideLocalURLCrossOriginEmbedderPolicy(
+      content::NavigationHandle* navigation_handle) override;
+#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
+  bool DoesSiteRequireDedicatedProcess(content::BrowserContext* browser_context,
+                                       const GURL& effective_site_url) override;
   void BindHostReceiverForRenderer(
       content::RenderProcessHost* render_process_host,
       mojo::GenericPendingReceiver receiver) override;

shell/browser/extensions/api/streams_private/streams_private_api.cc

@@ -71,7 +71,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
       std::move(transferrable_loader), original_url);
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-  if (base::FeatureList::IsEnabled(chrome_pdf::features::kPdfOopif) &&
+  if (chrome_pdf::features::IsOopifPdfEnabled() &&
       extension_id == extension_misc::kPdfExtensionId) {
     pdf::PdfViewerStreamManager::Create(web_contents);
     pdf::PdfViewerStreamManager::FromWebContents(web_contents)

shell/browser/feature_list.cc

@@ -34,10 +34,6 @@
 #include "printing/printing_features.h"
 #endif
 
-#if BUILDFLAG(IS_WIN)
-#include "ui/views/views_features.h"
-#endif
-
 namespace electron {
 
 void InitializeFeatureList() {
@@ -71,13 +67,6 @@ void InitializeFeatureList() {
       blink::features::kDropInputEventsWhilePaintHolding.name;
 
 #if BUILDFLAG(IS_WIN)
-  // Refs https://issues.chromium.org/issues/401996981
-  // TODO(deepak1556): Remove this once test added in
-  // https://github.com/electron/electron/pull/12904
-  // can work without this feature.
-  enable_features += std::string(",") +
-                     views::features::kEnableTransparentHwndEnlargement.name;
-
   // See https://chromium-review.googlesource.com/c/chromium/src/+/7204292
   // This feature causes the following sandbox failure on Windows:
   // sandbox\policy\win\sandbox_win.cc:777 Sandbox cannot access executable

shell/browser/native_window.cc

@@ -31,11 +31,6 @@
 #include "shell/browser/ui/views/frameless_view.h"
 #endif
 
-#if BUILDFLAG(IS_WIN)
-#include "ui/display/win/screen_win.h"
-#include "ui/views/views_features.h"
-#endif
-
 #if defined(USE_OZONE)
 #include "ui/base/ui_base_features.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ -71,31 +66,6 @@ struct Converter<electron::NativeWindow::TitleBarStyle> {
 
 namespace electron {
 
-namespace {
-
-#if BUILDFLAG(IS_WIN)
-gfx::Size GetExpandedWindowSize(const NativeWindow* window,
-                                bool transparent,
-                                gfx::Size size) {
-  if (!base::FeatureList::IsEnabled(
-          views::features::kEnableTransparentHwndEnlargement) ||
-      !transparent) {
-    return size;
-  }
-
-  gfx::Size min_size = display::win::GetScreenWin()->ScreenToDIPSize(
-      window->GetAcceleratedWidget(), gfx::Size{64, 64});
-
-  // Some AMD drivers can't display windows that are less than 64x64 pixels,
-  // so expand them to be at least that size. http://crbug.com/286609
-  gfx::Size expanded(std::max(size.width(), min_size.width()),
-                     std::max(size.height(), min_size.height()));
-  return expanded;
-}
-#endif
-
-}  // namespace
-
 NativeWindow::NativeWindow(const int32_t base_window_id,
                            const gin_helper::Dictionary& options,
                            NativeWindow* parent)
@@ -398,15 +368,7 @@ gfx::Size NativeWindow::GetContentMinimumSize() const {
 }
 
 gfx::Size NativeWindow::GetContentMaximumSize() const {
-  const auto size_constraints = GetContentSizeConstraints();
-  gfx::Size maximum_size = size_constraints.GetMaximumSize();
-
-#if BUILDFLAG(IS_WIN)
-  if (size_constraints.HasMaximumSize())
-    maximum_size = GetExpandedWindowSize(this, transparent(), maximum_size);
-#endif
-
-  return maximum_size;
+  return GetContentSizeConstraints().GetMaximumSize();
 }
 
 void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) {

shell/browser/ui/cocoa/electron_ns_window_delegate.mm

@@ -158,45 +158,43 @@ using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
         windowSize.width() - contentSize.width() + extraSize.width();
     double extraHeightPlusFrame = titleBarHeight + extraSize.height();
 
-    newSize.width =
-        roundf((frameSize.height - extraHeightPlusFrame) * aspectRatio +
-               extraWidthPlusFrame);
-    newSize.height =
-        roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
-               extraHeightPlusFrame);
+    auto widthForHeight = [&](double h) {
+      return (h - extraHeightPlusFrame) * aspectRatio + extraWidthPlusFrame;
+    };
+    auto heightForWidth = [&](double w) {
+      return (w - extraWidthPlusFrame) / aspectRatio + extraHeightPlusFrame;
+    };
+
+    newSize.width = roundf(widthForHeight(frameSize.height));
+    newSize.height = roundf(heightForWidth(newSize.width));
 
     // Clamp to minimum width/height while ensuring aspect ratio remains.
     NSSize minSize = [window minSize];
     NSSize zeroSize =
         shell_->has_frame() ? NSMakeSize(0, titleBarHeight) : NSZeroSize;
     if (!NSEqualSizes(minSize, zeroSize)) {
-      double minWidthForAspectRatio =
-          (minSize.height - titleBarHeight) * aspectRatio;
       bool atMinHeight =
           minSize.height > zeroSize.height && newSize.height <= minSize.height;
-      newSize.width = atMinHeight ? minWidthForAspectRatio
+      newSize.width = atMinHeight ? widthForHeight(minSize.height)
                                   : std::max(newSize.width, minSize.width);
 
-      double minHeightForAspectRatio = minSize.width / aspectRatio;
       bool atMinWidth =
           minSize.width > zeroSize.width && newSize.width <= minSize.width;
-      newSize.height = atMinWidth ? minHeightForAspectRatio
+      newSize.height = atMinWidth ? heightForWidth(minSize.width)
                                   : std::max(newSize.height, minSize.height);
     }
 
     // Clamp to maximum width/height while ensuring aspect ratio remains.
     NSSize maxSize = [window maxSize];
     if (!NSEqualSizes(maxSize, NSMakeSize(FLT_MAX, FLT_MAX))) {
-      double maxWidthForAspectRatio = maxSize.height * aspectRatio;
       bool atMaxHeight =
           maxSize.height < FLT_MAX && newSize.height >= maxSize.height;
-      newSize.width = atMaxHeight ? maxWidthForAspectRatio
+      newSize.width = atMaxHeight ? widthForHeight(maxSize.height)
                                   : std::min(newSize.width, maxSize.width);
 
-      double maxHeightForAspectRatio = maxSize.width / aspectRatio;
       bool atMaxWidth =
           maxSize.width < FLT_MAX && newSize.width >= maxSize.width;
-      newSize.height = atMaxWidth ? maxHeightForAspectRatio
+      newSize.height = atMaxWidth ? heightForWidth(maxSize.width)
                                   : std::min(newSize.height, maxSize.height);
     }
   }

shell/browser/ui/inspectable_web_contents.cc

@@ -11,7 +11,6 @@
 #include <string_view>
 #include <utility>
 
-#include "base/auto_reset.h"
 #include "base/base64.h"
 #include "base/containers/fixed_flat_set.h"
 #include "base/containers/span.h"
@@ -451,17 +450,13 @@ void InspectableWebContents::ShowDevTools(bool activate) {
 }
 
 void InspectableWebContents::CloseDevTools() {
-  if (is_showing_devtools_) {
-    close_devtools_pending_ = true;
-    return;
-  }
   if (GetDevToolsWebContents()) {
     frontend_loaded_ = false;
-    embedder_message_dispatcher_.reset();
     if (managed_devtools_web_contents_) {
       view_->CloseDevTools();
       managed_devtools_web_contents_.reset();
     }
+    embedder_message_dispatcher_.reset();
     if (!is_guest())
       web_contents_->Focus();
   }
@@ -556,74 +551,52 @@ void InspectableWebContents::CloseWindow() {
 void InspectableWebContents::LoadCompleted() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
-  if (!GetDevToolsWebContents())
-    return;
-
   frontend_loaded_ = true;
+  if (managed_devtools_web_contents_)
+    view_->ShowDevTools(activate_);
 
-  // ShowDevTools and SetIsDocked trigger focus on the DevTools WebContents.
-  // Focus events fire JS handlers via V8 microtask checkpoints, and those
-  // handlers can call closeDevTools() re-entrantly. Guard the entire show
-  // phase so that any re-entrant close is deferred until the stack unwinds.
-  {
-    base::AutoReset<bool> guard(&is_showing_devtools_, true);
-
-    if (managed_devtools_web_contents_)
-      view_->ShowDevTools(activate_);
-
-    // If the devtools can dock, "SetIsDocked" will be called by devtools
-    // itself.
-    if (!can_dock_) {
-      SetIsDocked(DispatchCallback(), false);
-      if (!devtools_title_.empty()) {
-        view_->SetTitle(devtools_title_);
-      }
-    } else {
-      if (dock_state_.empty()) {
-        const base::DictValue& prefs =
-            pref_service_->GetDict(kDevToolsPreferences);
-        const std::string* current_dock_state =
-            prefs.FindString("currentDockState");
-        if (current_dock_state) {
-          std::string sanitized;
-          base::RemoveChars(*current_dock_state, "\"", &sanitized);
-          dock_state_ = IsValidDockState(sanitized) ? sanitized : "right";
-        } else {
-          dock_state_ = "right";
-        }
-      }
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-      auto* api_web_contents = api::WebContents::From(GetWebContents());
-      if (api_web_contents) {
-        auto* win =
-            static_cast<NativeWindowViews*>(api_web_contents->owner_window());
-        // When WCO is enabled, undock the devtools if the current dock
-        // position overlaps with the position of window controls to avoid
-        // broken layout.
-        if (win && win->IsWindowControlsOverlayEnabled()) {
-          if (IsAppRTL() && dock_state_ == "left") {
-            dock_state_ = "undocked";
-          } else if (dock_state_ == "right") {
-            dock_state_ = "undocked";
-          }
-        }
-      }
-#endif
-      std::u16string javascript = base::UTF8ToUTF16(
-          "EUI.DockController.DockController.instance().setDockSide(\"" +
-          dock_state_ + "\");");
-      GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
-          javascript, base::NullCallback());
+  // If the devtools can dock, "SetIsDocked" will be called by devtools itself.
+  if (!can_dock_) {
+    SetIsDocked(DispatchCallback(), false);
+    if (!devtools_title_.empty()) {
+      view_->SetTitle(devtools_title_);
     }
-  }
-
-  // If CloseDevTools was called re-entrantly during the show phase (e.g. from
-  // a JS devtools-focused handler), execute the deferred close now that the
-  // focus notification stack has fully unwound.
-  if (close_devtools_pending_) {
-    close_devtools_pending_ = false;
-    CloseDevTools();
-    return;
+  } else {
+    if (dock_state_.empty()) {
+      const base::DictValue& prefs =
+          pref_service_->GetDict(kDevToolsPreferences);
+      const std::string* current_dock_state =
+          prefs.FindString("currentDockState");
+      if (current_dock_state) {
+        std::string sanitized;
+        base::RemoveChars(*current_dock_state, "\"", &sanitized);
+        dock_state_ = IsValidDockState(sanitized) ? sanitized : "right";
+      } else {
+        dock_state_ = "right";
+      }
+    }
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+    auto* api_web_contents = api::WebContents::From(GetWebContents());
+    if (api_web_contents) {
+      auto* win =
+          static_cast<NativeWindowViews*>(api_web_contents->owner_window());
+      // When WCO is enabled, undock the devtools if the current dock
+      // position overlaps with the position of window controls to avoid
+      // broken layout.
+      if (win && win->IsWindowControlsOverlayEnabled()) {
+        if (IsAppRTL() && dock_state_ == "left") {
+          dock_state_ = "undocked";
+        } else if (dock_state_ == "right") {
+          dock_state_ = "undocked";
+        }
+      }
+    }
+#endif
+    std::u16string javascript = base::UTF8ToUTF16(
+        "EUI.DockController.DockController.instance().setDockSide(\"" +
+        dock_state_ + "\");");
+    GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
+        javascript, base::NullCallback());
   }
 
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)

shell/browser/ui/inspectable_web_contents.h

@@ -268,14 +268,6 @@ class InspectableWebContents
   std::unique_ptr<InspectableWebContentsView> view_;
 
   bool frontend_loaded_ = false;
-
-  // Re-entrancy guard: ShowDevTools triggers focus on the DevTools WebContents,
-  // which fires JS events whose microtask checkpoint can re-entrantly call
-  // CloseDevTools(). Destroying the WebContents or its widget while the focus
-  // notification is still iterating observers is a CHECK/UAF. These flags defer
-  // the close until the show path has fully unwound.
-  bool is_showing_devtools_ = false;
-  bool close_devtools_pending_ = false;
   scoped_refptr<content::DevToolsAgentHost> agent_host_;
   std::unique_ptr<content::DevToolsFrontendHost> frontend_host_;
   std::unique_ptr<DevToolsEmbedderMessageDispatcher>

shell/browser/ui/views/win_frame_view.cc

@@ -106,29 +106,19 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
     if (SUCCEEDED(DwmGetWindowAttribute(
             views::HWNDForWidget(frame()), DWMWA_CAPTION_BUTTON_BOUNDS,
             &button_bounds, sizeof(button_bounds)))) {
-      gfx::RectF button_bounds_in_dips = gfx::ConvertRectToDips(
-          gfx::Rect(button_bounds), display::win::GetDPIScale());
-      // TODO(crbug.com/1131681): GetMirroredRect() requires an integer rect,
-      // but the size in DIPs may not be an integer with a fractional device
-      // scale factor. If we want to keep using integers, the choice to use
-      // ToFlooredRectDeprecated() seems to be doing the wrong thing given the
-      // comment below about insetting 1 DIP instead of 1 physical pixel. We
-      // should probably use ToEnclosedRect() and then we could have inset 1
-      // physical pixel here.
-      gfx::Rect buttons =
-          GetMirroredRect(gfx::ToFlooredRectDeprecated(button_bounds_in_dips));
-
+      gfx::Rect button_bounds_px(button_bounds);
       // There is a small one-pixel strip right above the caption buttons in
-      // which the resize border "peeks" through.
-      constexpr int kCaptionButtonTopInset = 1;
-      // The sizing region at the window edge above the caption buttons is
-      // 1 px regardless of scale factor. If we inset by 1 before converting
-      // to DIPs, the precision loss might eliminate this region entirely. The
-      // best we can do is to inset after conversion. This guarantees we'll
-      // show the resize cursor when resizing is possible. The cost of which
-      // is also maybe showing it over the portion of the DIP that isn't the
-      // outermost pixel.
-      buttons.Inset(gfx::Insets::TLBR(0, kCaptionButtonTopInset, 0, 0));
+      // which the resize border "peeks" through. Inset in physical pixels
+      // before converting to DIPs so the resize strip remains exposed at
+      // fractional scale factors.
+      button_bounds_px.Inset(gfx::Insets::TLBR(1, 0, 0, 0));
+
+      const gfx::RectF button_bounds_in_dips =
+          gfx::ConvertRectToDips(button_bounds_px, display::win::GetDPIScale());
+      // GetMirroredRect() requires an integer rect. Use ToEnclosedRect() so
+      // the top inset is preserved (rounded up) at fractional scale factors.
+      gfx::Rect buttons =
+          GetMirroredRect(gfx::ToEnclosedRect(button_bounds_in_dips));
       if (buttons.Contains(point))
         return HTNOWHERE;
     }

shell/common/crash_keys.cc

@@ -5,11 +5,11 @@
 #include "shell/common/crash_keys.h"
 
 #include <cstdint>
+#include <deque>
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
-#include "base/containers/circular_deque.h"
 #include "base/environment.h"
 #include "base/no_destructor.h"
 #include "base/strings/strcat.h"
@@ -28,17 +28,22 @@ namespace electron::crash_keys {
 
 namespace {
 
+// Do NOT replace with base::circular_deque. CrashKeyString wraps a
+// crashpad::Annotation that holds self-referential pointers and registers
+// in a process-global linked list; relocating elements (as circular_deque
+// does on growth) corrupts that list and hangs the crashpad handler.
+// std::deque never relocates existing elements. See #50795.
 auto& GetExtraCrashKeys() {
   constexpr size_t kMaxCrashKeyValueSize = 20320;
   static_assert(kMaxCrashKeyValueSize < crashpad::Annotation::kValueMaxSize,
                 "max crash key value length above what crashpad supports");
   using CrashKeyString = crash_reporter::CrashKeyString<kMaxCrashKeyValueSize>;
-  static base::NoDestructor<base::circular_deque<CrashKeyString>> extra_keys;
+  static base::NoDestructor<std::deque<CrashKeyString>> extra_keys;
   return *extra_keys;
 }
 
 auto& GetExtraCrashKeyNames() {
-  static base::NoDestructor<base::circular_deque<std::string>> crash_key_names;
+  static base::NoDestructor<std::deque<std::string>> crash_key_names;
   return *crash_key_names;
 }
 

spec/api-browser-window-spec.ts

@@ -5641,21 +5641,6 @@ describe('BrowserWindow module', () => {
         expectBoundsEqual(w.getSize(), [400, 300]);
       });
 
-      ifit(process.platform !== 'darwin')('works for a window smaller than 64x64', () => {
-        const w = new BrowserWindow({
-          show: false,
-          frame: false,
-          resizable: false,
-          transparent: true
-        });
-        w.setContentSize(60, 60);
-        expectBoundsEqual(w.getContentSize(), [60, 60]);
-        w.setContentSize(30, 30);
-        expectBoundsEqual(w.getContentSize(), [30, 30]);
-        w.setContentSize(10, 10);
-        expectBoundsEqual(w.getContentSize(), [10, 10]);
-      });
-
       ifit(process.platform === 'win32')('do not change window with frame bounds when maximized', () => {
         const w = new BrowserWindow({
           show: true,

spec/api-crash-reporter-spec.ts

@@ -250,6 +250,34 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.env.DISABLE_CRASH_REPORTER_
         expect(crash.addedThenRemoved).to.be.undefined();
       });
 
+      // Regression: base::circular_deque relocates elements on growth,
+      // corrupting crashpad::Annotation's self-referential pointers and
+      // causing missing crash keys or a hung handler. See crash_keys.cc.
+      it('does not corrupt the crashpad annotation list after deque reallocation', async function () {
+        // Tight timeout so a hanging handler fails fast instead of waiting
+        // for the mocha default of 120s.
+        this.timeout(45000);
+        const { port, waitForCrash } = await startServer();
+        runCrashApp('renderer-dynamic-keys', port);
+        const crash = await Promise.race([
+          waitForCrash(),
+          new Promise<never>((_resolve, reject) => {
+            global.setTimeout(
+              () => reject(new Error('crashpad handler hung walking corrupted annotation list; crash upload did not arrive within 30s')),
+              30000
+            );
+          })
+        ]);
+        expect(crash.process_type).to.equal('renderer');
+        const missing: string[] = [];
+        for (let i = 0; i < 50; i++) {
+          if ((crash as any)[`dyn-key-${i}`] !== `val-${i}`) {
+            missing.push(`dyn-key-${i}`);
+          }
+        }
+        expect(missing, `missing dynamic crash keys: ${missing.join(', ')}`).to.be.empty();
+      });
+
       it('contains v8 crash keys when a v8 crash occurs', async () => {
         const { remotely } = await startRemoteControlApp();
         const { port, waitForCrash } = await startServer();

spec/api-web-contents-spec.ts

@@ -1249,22 +1249,6 @@ describe('webContents module', () => {
       await devtoolsOpened2;
       expect(w.webContents.isDevToolsOpened()).to.be.true();
     });
-
-    it('does not crash when closing DevTools immediately after opening', async () => {
-      const w = new BrowserWindow({ show: true });
-      await w.loadURL('about:blank');
-
-      const devToolsFocused = once(w.webContents, 'devtools-focused');
-      w.webContents.openDevTools({ mode: 'detach' });
-      w.webContents.inspectElement(100, 100);
-      await devToolsFocused;
-
-      const devtoolsClosed = once(w.webContents, 'devtools-closed');
-      w.webContents.closeDevTools();
-      await devtoolsClosed;
-
-      expect(w.webContents.isDevToolsOpened()).to.be.false();
-    });
   });
 
   describe('setDevToolsTitle() API', () => {

spec/fixtures/apps/crash/main.js

@@ -51,6 +51,19 @@ app.whenReady().then(() => {
     });
     w.loadURL(`about:blank?set_extra=${setExtraParameters ? 1 : 0}`);
     w.webContents.on('render-process-gone', () => process.exit(0));
+  } else if (crashType === 'renderer-dynamic-keys') {
+    const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+    w.webContents.on('render-process-gone', () => process.exit(0));
+    w.webContents.on('did-finish-load', () => {
+      w.webContents.executeJavaScript(`
+        const { crashReporter } = require('electron');
+        for (let i = 0; i < 50; i++) {
+          crashReporter.addExtraParameter('dyn-key-' + i, 'val-' + i);
+        }
+        process.crash();
+      `);
+    });
+    w.loadURL('about:blank');
   } else if (crashType === 'node') {
     const crashPath = path.join(__dirname, 'node-crash.js');
     const child = childProcess.fork(crashPath, { silent: true });

yarn.lock

@@ -590,7 +590,7 @@ __metadata:
     "@types/semver": "npm:^7.5.8"
     "@types/stream-json": "npm:^1.7.8"
     "@types/temp": "npm:^0.9.4"
-    "@xmldom/xmldom": "npm:^0.8.11"
+    "@xmldom/xmldom": "npm:^0.8.12"
     buffer: "npm:^6.0.3"
     chalk: "npm:^4.1.0"
     check-for-leaks: "npm:^1.2.1"
@@ -2503,7 +2503,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@xmldom/xmldom@npm:^0.8.11, @xmldom/xmldom@npm:^0.8.8":
+"@xmldom/xmldom@npm:^0.8.12":
+  version: 0.8.12
+  resolution: "@xmldom/xmldom@npm:0.8.12"
+  checksum: 10c0/b733c84292d1bee32ef21a05aba8f9063456b51a54068d0b4a1abf5545156ee0b9894b7ae23775b5881b11c35a8a03871d1b514fb7e1b11654cdbee57e1c2707
+  languageName: node
+  linkType: hard
+
+"@xmldom/xmldom@npm:^0.8.8":
   version: 0.8.11
   resolution: "@xmldom/xmldom@npm:0.8.11"
   checksum: 10c0/e768623de72c95d3dae6b5da8e33dda0d81665047811b5498d23a328d45b13feb5536fe921d0308b96a4a8dd8addf80b1f6ef466508051c0b581e63e0dc74ed5