mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
29e0948f7b
* chore: bump chromium in DEPS to 143.0.7492.0 * chore: bump chromium in DEPS to 143.0.7493.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch Move os_crypt/sync and os_crypt/async shared code to os_crypt/common | https://chromium-review.googlesource.com/c/chromium/src/+/7081087 * chore: update add_didinstallconditionalfeatures.patch no manual changes; patch applied with fuzz Reland "Remove BackForwardTransitions flag" | https://chromium-review.googlesource.com/c/chromium/src/+/7079411 * chore: update printing.patch Avoid a reachable NOTREACHED() in PrintingContextLinux | https://chromium-review.googlesource.com/c/chromium/src/+/7081117 * chore: update allow_in-process_windows_to_have_different_web_prefs.patch patch reapplied manually due to context shear Reland "Remove BackForwardTransitions flag" | https://chromium-review.googlesource.com/c/chromium/src/+/7079411 * chore: update chore_provide_iswebcontentscreationoverridden_with_full_params.patch patch reapplied manually due to context shear Cleanup: format some content files | https://chromium-review.googlesource.com/c/chromium/src/+/7083290 * chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch patch manually reapplied for files moved upstream Move os_crypt/sync and os_crypt/async shared code to os_crypt/common | https://chromium-review.googlesource.com/c/chromium/src/+/7081087 * chore: update revert_cleanup_remove_feature_windelayspellcheckserviceinit.patch no manual changes; patch applied with fuzz [spelling+grammar restrictions] fix feature param name | https://chromium-review.googlesource.com/c/chromium/src/+/7081186 * chore: update patches * chore: fix broken includes in ElectronBrowserMainParts Move os_crypt/sync and os_crypt/async shared code to os_crypt/common | https://chromium-review.googlesource.com/c/chromium/src/+/7081087 * chore: bump chromium in DEPS to 143.0.7495.0 * chore: fixup patch indices * chore: bump chromium in DEPS to 143.0.7497.0 * chore: fixup patch indices * 7085081: Roll libc++ from d6739a332fe9 to bc00f6e9f739 (1 revision) https://chromium-review.googlesource.com/c/chromium/src/+/7085081 * 7081087: Move os_crypt/sync and os_crypt/async shared code to os_crypt/common https://chromium-review.googlesource.com/c/chromium/src/+/7081087 * test: fix failing spec --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
81 lines
4.1 KiB
Diff
81 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:47:44 -0700
|
|
Subject: gin_enable_disable_v8_platform.patch
|
|
|
|
We don't use gin to create the V8 platform, because we need to inject Node
|
|
things.
|
|
|
|
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
|
|
index 456409c9e84c7a061d474470c8e42c5ddb5eb799..87187d05175a9da4fd7af03ba8a139a2d9554551 100644
|
|
--- a/gin/isolate_holder.cc
|
|
+++ b/gin/isolate_holder.cc
|
|
@@ -162,11 +162,13 @@ void IsolateHolder::Initialize(ScriptMode mode,
|
|
std::string js_command_line_flags,
|
|
bool disallow_v8_feature_flag_overrides,
|
|
v8::FatalErrorCallback fatal_error_callback,
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
|
+ bool create_v8_platform) {
|
|
CHECK(allocator);
|
|
V8Initializer::Initialize(mode, js_command_line_flags,
|
|
disallow_v8_feature_flag_overrides,
|
|
- oom_error_callback);
|
|
+ oom_error_callback,
|
|
+ create_v8_platform);
|
|
g_array_buffer_allocator = allocator;
|
|
g_reference_table = reference_table;
|
|
g_fatal_error_callback = fatal_error_callback;
|
|
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
|
|
index 3909e70dc1425c2cb02624f4b3017784a2ae6c9d..a57b92f02085d6392e6d9d0cc037df6b972f3c31 100644
|
|
--- a/gin/public/isolate_holder.h
|
|
+++ b/gin/public/isolate_holder.h
|
|
@@ -120,7 +120,8 @@ class GIN_EXPORT IsolateHolder {
|
|
std::string js_command_line_flags = {},
|
|
bool disallow_v8_feature_flag_overrides = false,
|
|
v8::FatalErrorCallback fatal_error_callback = nullptr,
|
|
- v8::OOMErrorCallback oom_error_callback = nullptr);
|
|
+ v8::OOMErrorCallback oom_error_callback = nullptr,
|
|
+ bool create_v8_platform = true);
|
|
|
|
// Returns whether `Initialize` has already been invoked in the process.
|
|
// Initialization is a one-way operation (i.e., this method cannot return
|
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
|
index 5bb090c979889cfb802710b3e6fb33b698d96b57..95d0cac02240f0a64a129cb101a53a3bb86fc914 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -537,7 +537,8 @@ void SetFeatureFlags() {
|
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
const std::string& js_command_line_flags,
|
|
bool disallow_v8_feature_flag_overrides,
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
|
+ bool create_v8_platform) {
|
|
static bool v8_is_initialized = false;
|
|
if (v8_is_initialized)
|
|
return;
|
|
@@ -552,7 +553,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
}
|
|
SetFlags(mode, js_command_line_flags);
|
|
|
|
- v8::V8::InitializePlatform(V8Platform::Get());
|
|
+ if (create_v8_platform)
|
|
+ v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
// Set this as early as possible in order to ensure OOM errors are reported
|
|
// correctly.
|
|
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
|
|
index 1341b77198431e1c426bff043bdb2bbcf202c8ca..ec64afd9dd91b292604ca834a91b9cfbd52eb853 100644
|
|
--- a/gin/v8_initializer.h
|
|
+++ b/gin/v8_initializer.h
|
|
@@ -32,7 +32,8 @@ class GIN_EXPORT V8Initializer {
|
|
static void Initialize(IsolateHolder::ScriptMode mode,
|
|
const std::string& js_command_line_flags,
|
|
bool disallow_v8_feature_flag_overrides,
|
|
- v8::OOMErrorCallback oom_error_callback);
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
|
+ bool create_v8_platform = true);
|
|
|
|
// Get address and size information for currently loaded snapshot.
|
|
// If no snapshot is loaded, the return values are null for addresses
|