43ed763f18
* chore: bump chromium in DEPS to 133.0.6836.0 * chore: bump chromium in DEPS to 133.0.6838.0 * chore: update patches * 6006096: [Sync ESB] Integrate Chrome Toast UI https://chromium-review.googlesource.com/c/chromium/src/+/6006096 * Confine enable_device_bound_sessions buildflag to //net https://chromium-review.googlesource.com/c/chromium/src/+/6014679 * revert [api] Delete deprecated struct FastApiTypedArray https://chromium-review.googlesource.com/c/v8/v8/+/5982984 Also https://chromium-review.googlesource.com/c/v8/v8/+/5979766/1 * fixup revert [api] Delete deprecated struct FastApiTypedArray * Migrate remaining NOTREACHED()s in chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/5998172 * [Reland][Extensions] Remove ExtensionHostDelegate::GetJavaScriptDialogManager() https://chromium-review.googlesource.com/c/chromium/src/+/6020106 * Remove NOTREACHED_IN_MIGRATION() https://chromium-review.googlesource.com/c/chromium/src/+/6021996 * Remove Lock screen apps [#8] : remove lock screen extension https://chromium-review.googlesource.com/c/chromium/src/+/6005846 * Reland "Add CrashReporterClient::GetProductInfo(ProductInfo*)" https://chromium-review.googlesource.com/c/chromium/src/+/6012631 * Ozone/Wayland: remove lacros specific window states https://chromium-review.googlesource.com/c/chromium/src/+/6011215 * chore: bump chromium in DEPS to 133.0.6840.0 * chore: bump chromium in DEPS to 133.0.6841.0 * chore: bump chromium in DEPS to 133.0.6844.0 * implement virtual WebContents::CanUserEnterFullscreen * OnSearchifyStateChange -> OnSearchifyStarted * regen libc++ filenames * chore: bump chromium in DEPS to 133.0.6846.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
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 3ed29244ad407c3fd41879dbf2f7a8554a05236c..c210645cd2a6f2314d648112b50fe02050f7320f 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4816,9 +4816,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
|