7e7010dacf* chore: bump chromium in DEPS to 133.0.6847.0 * chore: bump chromium in DEPS to 133.0.6848.0 * chore: update patches * implement extensions::GlobalShortcutListener::ExecuteCommand stub https://chromium-review.googlesource.com/c/chromium/src/+/5871484 * fix: ismediakey patch, oops * fix: another missing bracket * chore: bump chromium in DEPS to 133.0.6850.0 * chore: update patches * SharedStorageOperationPtr -> SharedStorageModifierMethodPtr https://chromium-review.googlesource.com/c/chromium/src/+/5990970 * build GlobalShortcutListenerLinux https://chromium-review.googlesource.com/c/chromium/src/+/5871484 * chore: bump chromium in DEPS to 133.0.6851.0 * fix: include full type for network::mojom::SharedStorageModifierMethod * chore: update patches * chore: bump chromium in DEPS to 133.0.6852.0 * chore: update patches * build: remove duplicated icudtl.dat and snapshot_blob.bin https://chromium-review.googlesource.com/c/chromium/src/+/5999387 * fix: include static methods in node tests involving call stacks https://chromium-review.googlesource.com/c/v8/v8/+/5907815 * revert: moved code in picture-in-picture.patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> 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 2414e4c4dfadbe83e61968e8f7873b425ba99f4f..81305f3fe427b7d27d78e49de57390708753901c 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4837,9 +4837,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
|