2018-10-24 11:24:11 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-20 17:30:26 -07:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:47:44 -0700
|
|
|
|
Subject: gin_enable_disable_v8_platform.patch
|
|
|
|
|
2019-12-13 09:18:45 -08:00
|
|
|
We don't use gin to create the V8 platform, because we need to inject Node
|
|
|
|
things.
|
2018-09-20 17:30:26 -07:00
|
|
|
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
|
2025-02-03 15:10:57 -05:00
|
|
|
index 1ec03c80cfee5fc427fad846a4df41b98698961c..1bed0865ba952b611985d41b742274861926925d 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/gin/isolate_holder.cc
|
|
|
|
+++ b/gin/isolate_holder.cc
|
2025-02-03 15:10:57 -05:00
|
|
|
@@ -155,11 +155,13 @@ void IsolateHolder::Initialize(ScriptMode mode,
|
|
|
|
std::string js_command_line_flags,
|
|
|
|
bool disallow_v8_feature_flag_overrides,
|
2022-04-22 15:36:22 -07:00
|
|
|
v8::FatalErrorCallback fatal_error_callback,
|
|
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
2018-09-13 22:02:16 -07:00
|
|
|
+ bool create_v8_platform) {
|
|
|
|
CHECK(allocator);
|
2025-02-03 15:10:57 -05:00
|
|
|
V8Initializer::Initialize(mode, js_command_line_flags,
|
|
|
|
disallow_v8_feature_flag_overrides,
|
|
|
|
- oom_error_callback);
|
|
|
|
+ oom_error_callback,
|
|
|
|
+ create_v8_platform);
|
2018-09-13 22:02:16 -07:00
|
|
|
g_array_buffer_allocator = allocator;
|
|
|
|
g_reference_table = reference_table;
|
2022-04-22 15:36:22 -07:00
|
|
|
g_fatal_error_callback = fatal_error_callback;
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
|
2025-02-03 15:10:57 -05:00
|
|
|
index cb4517de39b2ca7b32db557c6d3dd0227ba5b4c2..d1d178de28c7d46db1c96ba321070612ef5812e1 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/gin/public/isolate_holder.h
|
|
|
|
+++ b/gin/public/isolate_holder.h
|
2025-02-03 15:10:57 -05:00
|
|
|
@@ -118,7 +118,8 @@ class GIN_EXPORT IsolateHolder {
|
|
|
|
std::string js_command_line_flags = {},
|
|
|
|
bool disallow_v8_feature_flag_overrides = false,
|
2022-04-22 15:36:22 -07:00
|
|
|
v8::FatalErrorCallback fatal_error_callback = nullptr,
|
|
|
|
- v8::OOMErrorCallback oom_error_callback = nullptr);
|
|
|
|
+ v8::OOMErrorCallback oom_error_callback = nullptr,
|
2018-09-13 22:02:16 -07:00
|
|
|
+ bool create_v8_platform = true);
|
|
|
|
|
2021-07-26 09:02:16 -07:00
|
|
|
// Returns whether `Initialize` has already been invoked in the process.
|
|
|
|
// Initialization is a one-way operation (i.e., this method cannot return
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
2025-02-03 15:10:57 -05:00
|
|
|
index b6799720cad84282c5c4586adaf263689fd30bbb..59abc24988ab4d194461a3ca4f4b2bb68395bada 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/gin/v8_initializer.cc
|
|
|
|
+++ b/gin/v8_initializer.cc
|
2025-02-03 15:10:57 -05:00
|
|
|
@@ -547,7 +547,8 @@ void SetFeatureFlags() {
|
2021-11-24 09:45:59 +01:00
|
|
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
2024-10-03 13:35:03 -04:00
|
|
|
const std::string& js_command_line_flags,
|
2025-02-03 15:10:57 -05:00
|
|
|
bool disallow_v8_feature_flag_overrides,
|
2022-04-22 15:36:22 -07:00
|
|
|
- v8::OOMErrorCallback oom_error_callback) {
|
|
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
2018-09-13 22:02:16 -07:00
|
|
|
+ bool create_v8_platform) {
|
|
|
|
static bool v8_is_initialized = false;
|
|
|
|
if (v8_is_initialized)
|
|
|
|
return;
|
2025-02-03 15:10:57 -05:00
|
|
|
@@ -561,7 +562,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
|
|
}
|
2022-03-24 21:39:03 -04:00
|
|
|
SetFlags(mode, js_command_line_flags);
|
2018-09-13 22:02:16 -07:00
|
|
|
|
|
|
|
- v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
+ if (create_v8_platform)
|
|
|
|
+ v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
|
2022-04-22 15:36:22 -07:00
|
|
|
// Set this as early as possible in order to ensure OOM errors are reported
|
|
|
|
// correctly.
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
|
2025-02-03 15:10:57 -05:00
|
|
|
index 1341b77198431e1c426bff043bdb2bbcf202c8ca..ec64afd9dd91b292604ca834a91b9cfbd52eb853 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/gin/v8_initializer.h
|
|
|
|
+++ b/gin/v8_initializer.h
|
2025-02-03 15:10:57 -05:00
|
|
|
@@ -32,7 +32,8 @@ class GIN_EXPORT V8Initializer {
|
2021-11-24 09:45:59 +01:00
|
|
|
static void Initialize(IsolateHolder::ScriptMode mode,
|
2025-02-03 15:10:57 -05:00
|
|
|
const std::string& js_command_line_flags,
|
|
|
|
bool disallow_v8_feature_flag_overrides,
|
|
|
|
- v8::OOMErrorCallback oom_error_callback);
|
|
|
|
+ v8::OOMErrorCallback oom_error_callback,
|
2018-09-13 22:02:16 -07:00
|
|
|
+ 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
|