612da3ec47* chore: bump chromium in DEPS to 135.0.7021.0 * chore: bump chromium in DEPS to 135.0.7023.0 * chore: update patches * chore: gen-libc++-filenames.js * [Extensions] Add a BUILD.gn file for the chrome.system.display API. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6227347 * chore: bump chromium in DEPS to 135.0.7025.0 * fixup! [Extensions] Add a BUILD.gn file for the chrome.system.display API. * [DevTools] Add support for automatic workspace folders. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6275926 * Add UseCounter for potential PNA 2.0 breakage Refs https://chromium-review.googlesource.com/c/chromium/src/+/6259197 * Remove references to NavigationEntry/Controller in Zoom code. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6258070 * chore: update patches * Allow DevTools to record UmaHistogramMediumTimes Refs https://chromium-review.googlesource.com/c/chromium/src/+/6183713 * chore: update patches * [gpu] Remove unnecessary media_buildflags include Refs https://chromium-review.googlesource.com/c/chromium/src/+/6286526 * chore: bump chromium in DEPS to 135.0.7027.0 * chore: update patches * Remove type alias Refs https://chromium-review.googlesource.com/c/chromium/src/+/6280957 * [Refactor] Make ExtensionRegistrar a browser keyed service. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6285230 * Remove unused functions Refs https://chromium-review.googlesource.com/c/chromium/src/+/6278736 * chore: IWYU --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
28 lines
1.5 KiB
Diff
28 lines
1.5 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 037e3a33c6238b22c6f82ca3ec17b85f3aba3cd4..b48b1e6e1c94abe5f64a7ac45194016ec27bd3b8 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4950,7 +4950,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
|
: IsGuest();
|
|
// 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(), is_guest);
|
|
+ // CHECK_EQ(source_site_instance->IsGuest(), is_guest);
|
|
|
|
// We usually create the new window in the same BrowsingInstance (group of
|
|
// script-related windows), by passing in the current SiteInstance. However,
|