adbd25f699
* chore: bump chromium in DEPS to 132.0.6817.0 * chore: update chromium patches * 5979290: Temoporarily disable crel on arm. | https://chromium-review.googlesource.com/c/chromium/src/+/5979290 * 5981701: Include callback.h instead of callback_forward.h | https://chromium-review.googlesource.com/c/chromium/src/+/5981701 * 5964918: [v8 code cache] Add a wpt_internal test demonstrating the code cache 304 problem | https://chromium-review.googlesource.com/c/chromium/src/+/5964918 * 5969697: Add NetworkTrafficAnnotationTag to PreconnectManager | https://chromium-review.googlesource.com/c/chromium/src/+/5969697 * chore: update remaining patches * chore: bump chromium in DEPS to 132.0.6818.0 * chore: update patches * 5983492: MPArch GuestView: Have executeScript target correct frame | https://chromium-review.googlesource.com/c/chromium/src/+/5983492 * chore: bump chromium in DEPS to 132.0.6820.0 * chore: update patches * 5989717: Revert "win: Remove special check for 10.0.22621.2428 Win SDK version" | https://chromium-review.googlesource.com/c/chromium/src/+/5989717 * 5968218: Send PDF Searchifier running state to browser to show UX elements. | https://chromium-review.googlesource.com/c/chromium/src/+/5968218 * build: also update the MSVS_HASH for WOA --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
29 lines
1.4 KiB
Diff
29 lines
1.4 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 e586a38486349b4cbf88b61a7673e55759f1c9b8..319800cec84a968b0e442fc760c8e1d701bda2ed 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4810,9 +4810,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
bool renderer_started_hidden =
|
|
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;
|
|
|
|
- // 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(), IsGuest());
|
|
bool is_guest = IsGuest();
|
|
|
|
// We usually create the new window in the same BrowsingInstance (group of
|