mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
afd5fb4a60
* chore: bump chromium in DEPS to 148.0.7776.0 * chore: bump chromium in DEPS to 148.0.7778.0 * fix(patch): buffered_data_source_host_impl include added upstream Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7712714 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * fix(patch): ASan process info callback added upstream Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7724018 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * fix(patch): ServiceProcessHost per-instance observer migration Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7700794 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * fix(patch): FSA BlockPath factory method refactor Upstream refactored BlockPath initialization to use factory methods (CreateRelative, CreateAbsolute, CreateSuffix) and a switch statement. Updated the exposed code in the header to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7665590 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * fix(patch): service process tracker per-instance observer refactor Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7700794 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * chore: update patches (trivial only) * 7723958: Rename blink::WebString::FromUTF16() to FromUtf16() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7723958 Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com> * fixup! fix(patch): ASan process info callback added upstream --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: Claude <svc-devxp-claude@slack-corp.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 aaa2b2229dac8c5e8cf590300b436082f6c3773b..e12758010f5c243d2fb9c733b74bcb0eea89f5da 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5472,7 +5472,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,
|