0c683552ec* chore: bump chromium in DEPS to 138.0.7158.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7160.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6509206: Move Keychain UI suppression code into apple_keychain.cc https://chromium-review.googlesource.com/c/chromium/src/+/6509206 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6489036: Fix DesktopDataControlsDialog for Glic https://chromium-review.googlesource.com/c/chromium/src/+/6489036 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6506662: Reland "NavigationThrottleRunner2: content::NavigationThrottleRegistry" https://chromium-review.googlesource.com/c/chromium/src/+/6506662 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6499811: [video pip] Add live caption dialog https://chromium-review.googlesource.com/c/chromium/src/+/6499811 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6487926: Add GetMaxImageDimension function to ScreenAI service API for OCR. https://chromium-review.googlesource.com/c/chromium/src/+/6487926 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6494942: [json] Activate stringify fast-path by default https://chromium-review.googlesource.com/c/v8/v8/+/6494942 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
28 lines
1.5 KiB
Diff
28 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 459fc0eff0bfe2ec005d6f34cf7e91c2d601fd06..35de681eac3f65ce3e0435bd984159154ece2b7f 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5051,7 +5051,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,
|