500d453a63
* chore: bump chromium in DEPS to 132.0.6827.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 132.0.6828.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 132.0.6830.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 132.0.6832.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 132.0.6834.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update chromium patches Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5977022: Apply os setting of overlay scrollbar to web instances | https://chromium-review.googlesource.com/c/chromium/src/+/5977022 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5991440: Cleanup //ui/compositor from LaCros support code. | https://chromium-review.googlesource.com/c/chromium/src/+/5991440 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * chore: update all patches Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 6000058: Add base_subdirs to file_chooser.mojom NativeFileInfo | https://chromium-review.googlesource.com/c/chromium/src/+/6000058 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 6009949: Rename NOTREACHED_NORETURN() uses to NOTREACHED() | https://chromium-review.googlesource.com/c/chromium/src/+/6009949 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5966419: [freezing] Expose frozen state to extensions (3/3 - add frozen to chrome.tabs.Tab). https://chromium-review.googlesource.com/c/chromium/src/+/5966419 Also https://chromium-review.googlesource.com/c/chromium/src/+/6006424 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> --------- 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: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@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 1b748a2e0d803217985847014855b095b53c58e5..0e742f196367bbbe8c4e147ef4db4f8dbbe4cbbe 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4813,9 +4813,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
|