9303a3fae9
* chore: bump chromium in DEPS to 135.0.7028.0 * chore: bump chromium in DEPS to 135.0.7029.0 * chore: bump chromium in DEPS to 135.0.7031.0 * chore: bump chromium in DEPS to 135.0.7033.0 * Split //component/embedder_support:browser_util into multiple targets6246155* chore: update patches * build: update filenames.libcxx.gni * 6275531: Enable Float16Array6275531* chore: bump chromium in DEPS to 135.0.7035.0 * chore: update patches * Move Service Process Host files to a separate folder6089368* Remove NOTREACHED()s after return statements6297811* Move ServiceProcessTracker and UtilityProcessClient into separate files6088677* chore: update filenames.libcxx.gni --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
80 lines
4.1 KiB
Diff
80 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 b3416c90c9071d8d32d30ecf257b64f133b2ae07..8632f1c18b407bb7832900bcebadacb3707224ac 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 ff42cfbb6a228e902317c7e3ab035d8437d5dd62..e27f177ce27e177abf6cee84cd466e7a8a829ee7 100644
|
|
--- a/gin/public/isolate_holder.h
|
|
+++ b/gin/public/isolate_holder.h
|
|
@@ -119,7 +119,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 93b49420765273ac2d49822ee406c3495aff25d4..7f7ea9ea6dd9b5f3af436570661fa736f912132e 100644
|
|
--- a/gin/v8_initializer.cc
|
|
+++ b/gin/v8_initializer.cc
|
|
@@ -548,7 +548,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;
|
|
@@ -562,7 +563,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
|