mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
6b72837203
* chore: bump chromium in DEPS to 114.0.5719.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: update patches
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
* revert eb07a797cc
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
---------
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Rose <japthorp@slack-corp.com>
|
|
Date: Mon, 20 Jun 2022 14:53:37 -0700
|
|
Subject: disable freezing flags after init in node
|
|
|
|
This was introduced in
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/3687671.
|
|
|
|
When running node in the renderer, flags are updated after initialization, so
|
|
freezing the flags in Blink causes node initialization to fail.
|
|
|
|
If possible, it would be ideal to do this without a patch.
|
|
https://bugs.chromium.org/p/v8/issues/detail?id=12887 suggests that there may
|
|
at some point be an API to "unfreeze" the flags, or we may be able to refactor
|
|
node initialization to not update flags after V8 initialization.
|
|
|
|
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
|
|
index 15928985bed40a7e0a26d9ab09f44f86ed3f3bd6..612616264b1caf097a4d45a4ba09e312b10e7acf 100644
|
|
--- a/content/renderer/render_process_impl.cc
|
|
+++ b/content/renderer/render_process_impl.cc
|
|
@@ -228,6 +228,9 @@ RenderProcessImpl::RenderProcessImpl()
|
|
v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
|
|
}
|
|
|
|
+ // Freezing flags after init conflicts with node in the renderer.
|
|
+ v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
|
|
+
|
|
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
|
|
if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
|
|
base::CommandLine* const command_line =
|