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

Leak IsolateData since Environment is also leaked

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-18 16:41:36 -08:00 • committed by Birunthan Mohanathas
parent 54e2c480cb
commit c374e37cc4
6 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/atom_browser_main_parts.cc
View file

@ -129,13 +129,9 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
// Support the "--debug" switch. // Support the "--debug" switch.
node_debugger_.reset(new NodeDebugger(js_env_->isolate())); node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
isolate_data_.reset(
new node::IsolateData(js_env_->isolate(), uv_default_loop()));
// Create the global environment. // Create the global environment.
node::Environment* env = node::Environment* env =
node_bindings_->CreateEnvironment(isolate_data_.get(), node_bindings_->CreateEnvironment(js_env_->context());
js_env_->context());
// Make sure node can get correct environment when debugging. // Make sure node can get correct environment when debugging.
if (node_debugger_->IsRunning()) if (node_debugger_->IsRunning())

5
atom/browser/atom_browser_main_parts.h
View file

@ -15,10 +15,6 @@
class BrowserProcess; class BrowserProcess;
namespace node {
class IsolateData;
}
namespace atom { namespace atom {
class AtomBindings; class AtomBindings;
@ -86,7 +82,6 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
std::unique_ptr<NodeBindings> node_bindings_; std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_; std::unique_ptr<AtomBindings> atom_bindings_;
std::unique_ptr<NodeDebugger> node_debugger_; std::unique_ptr<NodeDebugger> node_debugger_;
std::unique_ptr<node::IsolateData> isolate_data_;
base::Timer gc_timer_; base::Timer gc_timer_;

4
atom/common/node_bindings.cc
View file

@ -144,7 +144,7 @@ void NodeBindings::Initialize() {
} }
node::Environment* NodeBindings::CreateEnvironment( node::Environment* NodeBindings::CreateEnvironment(
node::IsolateData* isolate_data, v8::Handle<v8::Context> context) { v8::Handle<v8::Context> context) {
auto args = AtomCommandLine::argv(); auto args = AtomCommandLine::argv();
// Feed node the path to initialization script. // Feed node the path to initialization script.
@ -160,7 +160,7 @@ node::Environment* NodeBindings::CreateEnvironment(
std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args); std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
node::Environment* env = node::CreateEnvironment( node::Environment* env = node::CreateEnvironment(
isolate_data, context, new node::IsolateData(context->GetIsolate(), uv_default_loop()), context,
args.size(), c_argv.get(), 0, nullptr); args.size(), c_argv.get(), 0, nullptr);
// Node uses the deprecated SetAutorunMicrotasks(false) mode, we should switch // Node uses the deprecated SetAutorunMicrotasks(false) mode, we should switch

4
atom/common/node_bindings.h
View file

@ -16,7 +16,6 @@ class MessageLoop;
namespace node { namespace node {
class Environment; class Environment;
class IsolateData;
} }
namespace atom { namespace atom {
@ -31,8 +30,7 @@ class NodeBindings {
void Initialize(); void Initialize();
// Create the environment and load node.js. // Create the environment and load node.js.
node::Environment* CreateEnvironment(node::IsolateData* isolate_data, node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
v8::Handle<v8::Context> context);
// Load node.js in the environment. // Load node.js in the environment.
void LoadEnvironment(node::Environment* env); void LoadEnvironment(node::Environment* env);

5
atom/renderer/atom_renderer_client.cc
View file

@ -349,13 +349,10 @@ void AtomRendererClient::DidCreateScriptContext(
if (first_time) { if (first_time) {
node_bindings_->Initialize(); node_bindings_->Initialize();
node_bindings_->PrepareMessageLoop(); node_bindings_->PrepareMessageLoop();
isolate_data_.reset(new node::IsolateData(context->GetIsolate(),
uv_default_loop()));
} }
// Setup node environment for each window. // Setup node environment for each window.
node::Environment* env = node::Environment* env = node_bindings_->CreateEnvironment(context);
node_bindings_->CreateEnvironment(isolate_data_.get(), context);
// Add Electron extended APIs. // Add Electron extended APIs.
atom_bindings_->BindTo(env->isolate(), env->process_object()); atom_bindings_->BindTo(env->isolate(), env->process_object());

5
atom/renderer/atom_renderer_client.h
View file

@ -10,10 +10,6 @@
#include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/content_renderer_client.h"
namespace node {
class IsolateData;
}
namespace atom { namespace atom {
class AtomBindings; class AtomBindings;
@ -73,7 +69,6 @@ class AtomRendererClient : public content::ContentRendererClient {
std::unique_ptr<NodeBindings> node_bindings_; std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_; std::unique_ptr<AtomBindings> atom_bindings_;
std::unique_ptr<PreferencesManager> preferences_manager_; std::unique_ptr<PreferencesManager> preferences_manager_;
std::unique_ptr<node::IsolateData> isolate_data_;
bool isolated_world_; bool isolated_world_;
DISALLOW_COPY_AND_ASSIGN(AtomRendererClient); DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);