e0f72dc332
* chore: bump chromium in DEPS to 133.0.6887.0 * chore: update render_widget_host_view_base.patch trivial manual intervention needed due to header context shear Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5952851 * chore: update osr_shared_texture_remove_keyed_mutex_on_win_dxgi.patch trivial manual intervention needed due to header context shear Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6068570 * chore: e patches all * Remove ClipboardFormatType::GetType() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6075792 * Remove raw byte range methods from network::ResourceRequestBody Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6038757 * fix: update patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch:wq Refs https://issues.chromium.org/issues/40092527 * fix: windows gn check * chore: update patches/chromium/render_widget_host_view_base.patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.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 e878d103eb79cbb67878e7c6da369d355b45ac40..e49fd4b3278b4a25af30ecc522794847440d4c50 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4849,9 +4849,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
|