5953dca8be
* chore: bump chromium in DEPS to 138.0.7166.1 * chore: bump chromium in DEPS to 138.0.7166.2 * chore: bump chromium in DEPS to 138.0.7168.1 * chore: bump chromium in DEPS to 138.0.7169.2 * chore: bump chromium in DEPS to 138.0.7170.1 * chore: bump chromium in DEPS to 138.0.7172.1 * chore: bump chromium in DEPS to 138.0.7173.0 * chore: bump chromium in DEPS to 138.0.7175.0 * chore: bump chromium in DEPS to 138.0.7177.1 * chore: bump chromium in DEPS to 138.0.7178.2 * chore: bump chromium in DEPS to 138.0.7180.1 * chore: bump chromium in DEPS to 138.0.7181.0 * chore: bump chromium in DEPS to 138.0.7182.2 * chore: bump chromium in DEPS to 138.0.7184.0 * chore: bump chromium in DEPS to 138.0.7186.0 * chore: bump chromium in DEPS to 138.0.7188.0 * chore: bump chromium in DEPS to 138.0.7190.1 * chore: bump chromium in DEPS to 138.0.7192.0 * chore: bump chromium in DEPS to 138.0.7194.1 * chore: bump chromium in DEPS to 138.0.7196.1 * chore: bump chromium in DEPS to 138.0.7198.1 * chore: bump chromium in DEPS to 138.0.7200.0 * chore: bump chromium in DEPS to 138.0.7202.0 * chore: bump chromium in DEPS to 138.0.7204.0 * chore: bump chromium in DEPS to 138.0.7204.5 * chore: bump chromium in DEPS to 138.0.7204.4 * 6543986: Mac: decouple deserializing and applying sandbox policy Refs6543986(cherry picked from commit d386063e9d2414a35c91c4fa017665d950de5882) * 6566111: Change UtilityProcessHost to manage its instance internally Refs6566111(cherry picked from commit 93a0a91d447c118de33efec079365f5d0e8363db) * chore: update patches * 6577970: Remove superfluous includes for base/strings/stringprintf.h in headers Refs6577970(cherry picked from commit 9ba045f3715d85792e4aa12139e7e05e0b772634) * 6568811: Add FunctionCall structured metrics event for DevTools Refs6568811(cherry picked from commit 79ae6f2c8b53568b6277998cfe9a91e3a1ee595b) * [PDF Ink Signatures] Support PdfAnnotationsEnabled policy6558970* Mac: Switch to Xcode 16.3 (16E140) and SDK 15.4 (24E241)6431799* chore: bump chromium in DEPS to 138.0.7204.15 * chore: update patches * fixup Mac: decouple deserializing and applying sandbox policy6543986* chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.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 fbe6b5d24185c0b0e664db05c7801434737d4d8d..51798b8ceb81cf9d374cf594aa6afbcb366f4732 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5233,7 +5233,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,
|