3772e267c3
* chore: bump chromium in DEPS to 136.0.7066.1 * chore: bump chromium in DEPS to 136.0.7067.0 * chore: bump chromium in DEPS to 136.0.7067.3 * chore: bump chromium in DEPS to 136.0.7069.1 * chore: bump chromium in DEPS to 136.0.7071.0 * chore: bump chromium in DEPS to 136.0.7073.1 * chore: bump chromium in DEPS to 136.0.7075.1 * chore: bump chromium in DEPS to 136.0.7076.1 * chore: bump chromium in DEPS to 136.0.7077.1 * chore: bump chromium to 136.0.7064.0 (main) (#45985) * chore: bump chromium in DEPS to 136.0.7063.0 * chore: bump chromium in DEPS to 136.0.7064.0 * 6169919: Instantiate Linux (or CrOS) system fonts using Fontations Refs6169919* 6341209: Remove file-wide unsafe buffer suppression from content/ [1 of N]. Refs6341209* chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> (cherry picked from commit962d8b325a) * chore: bump chromium to 136.0.7067.0 (main) (#46018) * chore: bump chromium in DEPS to 136.0.7066.0 * chore: bump chromium in DEPS to 136.0.7067.0 * 6325710: [LNA] Add Local Network Access permission type Refs6325710* 6342514: Create frame mojo endpoints in renderer during window.open() Refs6342514* 6344040: Create widget mojo endpoints in renderer process for window.open() Refs6344040* chore: update patches * 6349218: Move ExtensionService::install_directory() to ExtensionRegistrar Refs6349218* 6349395: Move ExtensionService::extensions_enabled() to ExtensionRegistrar Refs6349395* 6331510: Migrate views::Background class to ui::ColorVariant |6331510* build: reorder set-cookie step https://github.com/electron/electron/pull/46091 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: alice <alice@makenotion.com> (cherry picked from commitb13f05e2dc) * chore: update patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 6010d9f9fc9bfeffb3e5a64de7352b52a202cbf7..4325cdfd256ae7a1008e073d42da995b82df5bba 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4980,7 +4980,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,
|