Browse Source

chore: bump chromium to 126.0.6478.114 (31-x-y) (#42584)

* chore: bump chromium in DEPS to 126.0.6478.114

* chore: update patches

* Fix decoration insets getting out-of-sync

 https://chromium-review.googlesource.com/c/chromium/src/+/5636771

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <[email protected]>
electron-roller[bot] 10 months ago
parent
commit
04b6a162ea

+ 1 - 1
DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '126.0.6478.61',
+    '126.0.6478.114',
   'node_version':
     'v20.14.0',
   'nan_version':

+ 1 - 1
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -46,7 +46,7 @@ index 0be27cd41b86673d7c8a4a8d7211a19ad8c8e36c..e67d70e81cbad7520616e5d19565d59d
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 24769e88d21f17acbabc00c235fa39539c51ee00..915750337ebc1c939ae81149b0058ba0be307254 100644
+index 6870df1cee3431d979f2a729316d6449dbf1bea5..b049528a981b1353d0092b4f8e5cc5ab8ed4e17b 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -7317,9 +7317,12 @@ test("unit_tests") {

+ 2 - 2
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch

@@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
 Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
 
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index f62d0f627536a344a287ecc1a917bdfbc72615b8..1a00bbe6093ed8a331e87c8a4a010788f78933d4 100644
+index 77ee94a9c99b67116bb84bed41a6c4da3048a05a..494fb8c04116f39ab1e8d18162fac114e739931d 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -10403,6 +10403,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
+@@ -10424,6 +10424,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
      }
    }
  

+ 5 - 2
shell/browser/ui/electron_desktop_window_tree_host_linux.cc

@@ -47,8 +47,11 @@ void ElectronDesktopWindowTreeHostLinux::OnWidgetInitDone() {
 
 gfx::Insets ElectronDesktopWindowTreeHostLinux::CalculateInsetsInDIP(
     ui::PlatformWindowState window_state) const {
-  // If we are not showing frame, the insets should be zero.
-  if (!native_window_view_->IsFullscreen()) {
+  // If we are not showing frame, or we are not dealing with a
+  // ClientFrameViewLinux the insets should be zero.
+  if (!native_window_view_->IsFullscreen() ||
+      !native_window_view_->has_frame() ||
+      !native_window_view_->has_client_frame()) {
     return gfx::Insets();
   }