1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- 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 570a23af3c0fb4839b063c742d1d345a27799cd0..ece381bb1ce22bc65c3d8e428354adeb4b6fe4c1 100644
- --- a/gin/isolate_holder.cc
- +++ b/gin/isolate_holder.cc
- @@ -103,9 +103,10 @@ IsolateHolder::~IsolateHolder() {
- // static
- void IsolateHolder::Initialize(ScriptMode mode,
- v8::ArrayBuffer::Allocator* allocator,
- - const intptr_t* reference_table) {
- + const intptr_t* reference_table,
- + bool create_v8_platform) {
- CHECK(allocator);
- - V8Initializer::Initialize(mode);
- + V8Initializer::Initialize(mode, create_v8_platform);
- g_array_buffer_allocator = allocator;
- g_reference_table = reference_table;
- }
- diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
- index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632bec50ba89 100644
- --- a/gin/public/isolate_holder.h
- +++ b/gin/public/isolate_holder.h
- @@ -88,7 +88,8 @@ class GIN_EXPORT IsolateHolder {
- // reference pointers. Otherwise, it can be nullptr.
- static void Initialize(ScriptMode mode,
- v8::ArrayBuffer::Allocator* allocator,
- - const intptr_t* reference_table = nullptr);
- + const intptr_t* reference_table = nullptr,
- + bool create_v8_platform = true);
-
- v8::Isolate* isolate() { return isolate_; }
-
- diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
- index 630814e5af46abc3d035a8ec12a83016a94fc323..00e24954441630d45ba42759755ee432c3e80cde 100644
- --- a/gin/v8_initializer.cc
- +++ b/gin/v8_initializer.cc
- @@ -191,12 +191,14 @@ enum LoadV8FileResult {
- } // namespace
-
- // static
- -void V8Initializer::Initialize(IsolateHolder::ScriptMode mode) {
- +void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
- + 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());
-
- if (!base::FeatureList::IsEnabled(features::kV8OptimizeJavascript)) {
- // We avoid explicitly passing --opt if kV8OptimizeJavascript is enabled
- diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
- index 2918c6235688ee4eb7c43387296e6d24145c14aa..069c2c96d5067f0444dac3c6ce6d83f75e770129 100644
- --- a/gin/v8_initializer.h
- +++ b/gin/v8_initializer.h
- @@ -20,7 +20,8 @@ namespace gin {
- class GIN_EXPORT V8Initializer {
- public:
- // This should be called by IsolateHolder::Initialize().
- - static void Initialize(IsolateHolder::ScriptMode mode);
- + static void Initialize(IsolateHolder::ScriptMode mode,
- + 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
|