mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
a06b49aca1
* chore: bump chromium in DEPS to 148.0.7755.0 * chore: bump chromium in DEPS to 148.0.7756.0 * chore: update patches * 7698536: Wire up experiment arms for Glic summarize pdf button. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698536 * 7695602: Include gperf to sources for iOS builds Refs https://chromium-review.googlesource.com/c/chromium/src/+/7695602 * 7671200: Expose IgnoreDuplicateNavs in WebView Refs https://chromium-review.googlesource.com/c/chromium/src/+/7671200 * chore: bump chromium in DEPS to 148.0.7758.0 * chore: update patches * 7701873: Allow running completion callbacks directly in CommitPresentedFrameToCA() on Mac Refs https://chromium-review.googlesource.com/c/chromium/src/+/7701873 * 7697732: Enhance diagnostic logging for ScreenCaptureKit errors on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/7697732 * 7698176: Disallow cookies with empty name and ambiguous value Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698176 * 7607319: Code Health: Use span in base::HexEncode Refs https://chromium-review.googlesource.com/c/chromium/src/+/7607319 * chore: bump chromium in DEPS to 148.0.7759.0 * chore: update patches * 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ Refs https://chromium-review.googlesource.com/c/chromium/src/+/7696478 * 7656748: Fixed controlled frame fullscreen crash Refs https://chromium-review.googlesource.com/c/chromium/src/+/7656748 * chore: update patches * fixup! 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
29 lines
1.5 KiB
Diff
29 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 97af9d9d374b9145e0e8a05cd5e48a621e2b0e87..a10a56827e0d277dfcc5bc8e72f90f7539ed50fd 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5468,7 +5468,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->GetSecurityPrincipal().IsGuest(), is_guest);
|
|
+ // CHECK_EQ(source_site_instance->GetSecurityPrincipal().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,
|