mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
777b6c70a2
* chore: bump chromium in DEPS to 143.0.7490.0 * chore: bump chromium in DEPS to 143.0.7491.0 * chore: update add_didinstallconditionalfeatures.patch no manual changes; patch applied with fuzz Revert "Remove BackForwardTransitions flag" | https://chromium-review.googlesource.com/c/chromium/src/+/7078209 * chore: update allow_in-process_windows_to_have_different_web_prefs.patch patch reapplied manually due to context shear Remove BackForwardTransitions flag | https://chromium-review.googlesource.com/c/chromium/src/+/7022596 * chore: update allow_electron_to_depend_on_components_os_crypt_sync.patch no manual changes; patch applied with fuzz Remove usage of os_crypt/sync in chrome/browser/ui | https://chromium-review.googlesource.com/c/chromium/src/+/7062066 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Sat, 28 Sep 2024 17:33:51 -0500
|
|
Subject: chore: partial revert of
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/5894233
|
|
|
|
The `CHECK_EQ()` being removed here is failing in the Chromium roll.
|
|
I experimented with backporting the `CHECK_EQ()` to `main` and it's
|
|
failing there as well, so some pre-existing behavior in Electron is
|
|
incompatible with this assertion.
|
|
|
|
I will file an upgrades-followup-task issue in Electron and try to
|
|
track down the source of this problem & figure out if we can fix it
|
|
by changing something in Electron.
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index 808e961195a435e747236ce982dea722267a30dc..2798b165fcd0909f7329caa1cb4c8fcbe0934ef9 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5327,7 +5327,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
: IsGuest();
|
|
// While some guest types do not have a guest SiteInstance, the ones that
|
|
// don't all override WebContents creation above.
|
|
- CHECK_EQ(source_site_instance->IsGuest(), is_guest);
|
|
+ // CHECK_EQ(source_site_instance->IsGuest(), is_guest);
|
|
|
|
// We usually create the new window in the same BrowsingInstance (group of
|
|
// script-related windows), by passing in the current SiteInstance. However,
|