mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: intercept the isolate_holder's new isolate and register it with the node platform before initialization

Browse source 
Chromium Change: 1015020
This commit is contained in:
Samuel Attard 2018-10-03 17:06:40 +10:00 • committed by Jeremy Apthorp
parent bacc36dde1
commit 7589c56cea
9 changed files with 139 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/browser/javascript_environment.cc
View file

@ -21,13 +21,19 @@ namespace atom {
JavascriptEnvironment::JavascriptEnvironment()
: initialized_(Initialize()),
isolate_holder_(base::ThreadTaskRunnerHandle::Get()),
isolate_holder_(base::ThreadTaskRunnerHandle::Get(),
new AtomIsolateAllocator(this)),
isolate_(isolate_holder_.isolate()),
isolate_scope_(isolate_),
locker_(isolate_),
handle_scope_(isolate_),
context_(isolate_, v8::Context::New(isolate_)),
context_scope_(v8::Local<v8::Context>::New(isolate_, context_)) {}
context_scope_(v8::Local<v8::Context>::New(isolate_, context_)) {
// The assumption is made here that the isolate_holder_ holds a single isolate
// if this is not the case or changes in the constructor above the logic
// below must be rewritten
node::InitializePrivatePropertiesOnIsolateData(isolate_data_);
}
JavascriptEnvironment::~JavascriptEnvironment() = default;
@ -64,4 +70,16 @@ NodeEnvironment::~NodeEnvironment() {
node::FreeEnvironment(env_);
}
AtomIsolateAllocator::AtomIsolateAllocator(JavascriptEnvironment* env)
: env_(env) {}
v8::Isolate* AtomIsolateAllocator::Allocate() {
v8::Isolate* isolate = v8::Isolate::Allocate();
// This is a cheatsy way to add the Isolate and it's IsolateData to the node
// platform before it is ready
env_->set_isolate_data(node::CreateIsolateData(
isolate, uv_default_loop(), env_->platform(), true /* only_register */));
return isolate;
}
} // namespace atom