Use Node's V8Platform instead of gin's

This commit is contained in:
Cheng Zhao 2017-12-08 09:23:17 +09:00
parent a0ebde0181
commit 00afeaba9a
3 changed files with 15 additions and 2 deletions

View file

@ -8,6 +8,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/task_scheduler/initialization_util.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "gin/array_buffer.h" #include "gin/array_buffer.h"
@ -44,9 +45,17 @@ bool JavascriptEnvironment::Initialize() {
if (!js_flags.empty()) if (!js_flags.empty())
v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size()); v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
// The V8Platform of gin relies on Chromium's task schedule, which has not
// been started at this point, so we have to rely on Node's V8Platform.
platform_ = node::CreatePlatform(
base::RecommendedMaxNumberOfThreadsInPool(3, 8, 0.1, 0),
uv_default_loop(), nullptr);
v8::V8::InitializePlatform(platform_);
gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode, gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
gin::IsolateHolder::kStableV8Extras, gin::IsolateHolder::kStableV8Extras,
gin::ArrayBufferAllocator::SharedInstance()); gin::ArrayBufferAllocator::SharedInstance(),
false);
return true; return true;
} }

View file

@ -10,6 +10,7 @@
namespace node { namespace node {
class Environment; class Environment;
class NodePlatform;
} }
namespace atom { namespace atom {
@ -30,6 +31,9 @@ class JavascriptEnvironment {
private: private:
bool Initialize(); bool Initialize();
// Leaked on exit.
node::NodePlatform* platform_;
bool initialized_; bool initialized_;
gin::IsolateHolder isolate_holder_; gin::IsolateHolder isolate_holder_;
v8::Isolate* isolate_; v8::Isolate* isolate_;

@ -1 +1 @@
Subproject commit 5b358f66a9948225e006fa3807213edf6e604409 Subproject commit 734f8be87b4962386f532b9b2ea35c6ac0cb9f44