From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheng Zhao 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 0b14695a25f9a36a008fca636f98eb26e36ecc7d..3c57e1273453388fac9c7a7593f767d413f00dbe 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -534,7 +534,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; @@ -549,7 +550,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