mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
b847299f19
* chore: bump chromium in DEPS to 146.0.7650.0 * 7496671: WaaP: Control hung delay for Initial WebUI Refs https://chromium-review.googlesource.com/c/chromium/src/+/7496671 * 7494302: [//media] Rename renderable_gpu_memory_buffer_video_frame_pool* Refs https://chromium-review.googlesource.com/c/chromium/src/+/7494302 * chore: update patches * 7502996: [DevTools] Add ability to toggle Chromium feature flags from DevTools Refs https://chromium-review.googlesource.com/c/chromium/src/+/7502996 * 7456200: Vectorize StringImpl::CopyChars and EqualIgnoringASCIICase using Highway. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 * 7236627: spellcheck: supply full spelling marker info, incld. marker type Refs https://chromium-review.googlesource.com/c/chromium/src/+/7236627 * chore: rm dependency on wtf::string from blink public headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 added a public dependency on //third_party/highway for //third_party/blink/renderer/platform/wtf:wtf which will not be inherited by //content/renderer since wtf is internal dependency of blink leading to the following compilation error ``` In file included from ../../content/public/renderer/window_features_converter.cc:5: In file included from ../../content/public/renderer/window_features_converter.h:10: In file included from ../../third_party/blink/public/web/web_window_features.h:38: In file included from ../../third_party/blink/renderer/platform/wtf/text/wtf_string.h:40: ../../third_party/blink/renderer/platform/wtf/text/string_impl.h:27:10: fatal error: 'hwy/highway.h' file not found 27 | #include <hwy/highway.h> | ^~~~~~~~~~~~~~~ 1 error generated. ``` Use `gn desc out/Testing content/renderer:renderer_sources --blame` to verify the inherited config and dependency list. * 7493995: Restore directive part of wasm-eval error message Refs https://chromium-review.googlesource.com/c/chromium/src/+/7493995 --------- 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: deepak1556 <hop2deep@gmail.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 aa42c0a3815cb28387ee57dcfe1fc30a7b6500f1..fc5c7782035bb4d0b9d673cb125062f47cd98a14 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -5317,7 +5317,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,
|