2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00: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 17:18:45 +00:00
|
|
|
We don't use gin to create the V8 platform, because we need to inject Node
|
|
|
|
things.
|
2018-09-21 00:30:26 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
|
2021-11-24 08:45:59 +00:00
|
|
|
index 6305d03e2315e8b9925071c018a81c102dda2a55..2bed8f7ce21ab052c0c319775875b9cf008b2636 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/gin/isolate_holder.cc
|
|
|
|
+++ b/gin/isolate_holder.cc
|
2021-11-24 08:45:59 +00:00
|
|
|
@@ -115,9 +115,10 @@ IsolateHolder::~IsolateHolder() {
|
2018-09-14 05:02:16 +00:00
|
|
|
void IsolateHolder::Initialize(ScriptMode mode,
|
|
|
|
v8::ArrayBuffer::Allocator* allocator,
|
2021-11-24 08:45:59 +00:00
|
|
|
const intptr_t* reference_table,
|
|
|
|
- const std::string js_command_line_flags) {
|
|
|
|
+ const std::string js_command_line_flags,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ bool create_v8_platform) {
|
|
|
|
CHECK(allocator);
|
2021-11-24 08:45:59 +00:00
|
|
|
- V8Initializer::Initialize(mode, js_command_line_flags);
|
|
|
|
+ V8Initializer::Initialize(mode, js_command_line_flags, create_v8_platform);
|
2018-09-14 05:02:16 +00:00
|
|
|
g_array_buffer_allocator = allocator;
|
|
|
|
g_reference_table = reference_table;
|
|
|
|
}
|
|
|
|
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
|
2022-01-10 22:31:39 +00:00
|
|
|
index 78133f9b34327c311c69620af621eba3d7f2cbf9..a965545de342811e468594fab4d792fc5c4daf32 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/gin/public/isolate_holder.h
|
|
|
|
+++ b/gin/public/isolate_holder.h
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -100,7 +100,8 @@ class GIN_EXPORT IsolateHolder {
|
2018-09-14 05:02:16 +00:00
|
|
|
static void Initialize(ScriptMode mode,
|
|
|
|
v8::ArrayBuffer::Allocator* allocator,
|
2021-11-24 08:45:59 +00:00
|
|
|
const intptr_t* reference_table = nullptr,
|
|
|
|
- const std::string js_command_line_flags = {});
|
|
|
|
+ const std::string js_command_line_flags = {},
|
2018-09-14 05:02:16 +00:00
|
|
|
+ bool create_v8_platform = true);
|
|
|
|
|
2021-07-26 16:02:16 +00: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-14 05:02:16 +00:00
|
|
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
2022-01-10 22:31:39 +00:00
|
|
|
index f576fc909eed4168130571590e3a80d19ccc3dd8..ff91f59446275d027ac7100c1eb0dcd1051993da 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/gin/v8_initializer.cc
|
|
|
|
+++ b/gin/v8_initializer.cc
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -341,12 +341,14 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
// static
|
2021-11-24 08:45:59 +00:00
|
|
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
|
|
|
- const std::string js_command_line_flags) {
|
|
|
|
+ const std::string js_command_line_flags,
|
2018-09-14 05:02:16 +00:00
|
|
|
+ bool create_v8_platform) {
|
|
|
|
static bool v8_is_initialized = false;
|
|
|
|
if (v8_is_initialized)
|
|
|
|
return;
|
|
|
|
|
|
|
|
- v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
+ if (create_v8_platform)
|
|
|
|
+ v8::V8::InitializePlatform(V8Platform::Get());
|
|
|
|
|
2021-11-24 08:45:59 +00:00
|
|
|
// Set this early on as some initialization steps, such as the initialization
|
|
|
|
// of the virtual memory cage, already use V8's random number generator.
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
|
2021-11-24 08:45:59 +00:00
|
|
|
index de650aa85dd083ec8c99d72b1f6cc447bb277f09..da97190ca86f5e04dd74dbff2282901fb4713f5b 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/gin/v8_initializer.h
|
|
|
|
+++ b/gin/v8_initializer.h
|
2021-11-24 08:45:59 +00:00
|
|
|
@@ -29,7 +29,8 @@ class GIN_EXPORT V8Initializer {
|
2018-09-14 05:02:16 +00:00
|
|
|
public:
|
|
|
|
// This should be called by IsolateHolder::Initialize().
|
2021-11-24 08:45:59 +00:00
|
|
|
static void Initialize(IsolateHolder::ScriptMode mode,
|
|
|
|
- const std::string js_command_line_flags = {});
|
|
|
|
+ const std::string js_command_line_flags = {},
|
2018-09-14 05:02:16 +00: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
|