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

Fix linking problem with NodePlatform

Browse source
This commit is contained in:
Cheng Zhao 2017-11-13 11:43:08 +09:00
parent efd949ea83
commit 3138c85218
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/node_debugger.cc
View file

@ -17,6 +17,7 @@ NodeDebugger::NodeDebugger(node::Environment* env) : env_(env) {
} }
NodeDebugger::~NodeDebugger() { NodeDebugger::~NodeDebugger() {
FreePlatform(platform_);
} }
void NodeDebugger::Start() { void NodeDebugger::Start() {
@ -37,9 +38,9 @@ void NodeDebugger::Start() {
// Use custom platform since the gin platform does not work correctly // Use custom platform since the gin platform does not work correctly
// with node's inspector agent. We use the default thread pool size // with node's inspector agent. We use the default thread pool size
// specified by node.cc // specified by node.cc
platform_.reset(new node::NodePlatform( platform_ = node::CreatePlatform(
/* thread_pool_size */ 4, env_->event_loop(), /* thread_pool_size */ 4, env_->event_loop(),
/* tracing_controller */ nullptr)); /* tracing_controller */ nullptr);
// Set process._debugWaitConnect if --inspect-brk was specified to stop // Set process._debugWaitConnect if --inspect-brk was specified to stop
// the debugger on the first line // the debugger on the first line
@ -48,7 +49,7 @@ void NodeDebugger::Start() {
process.Set("_breakFirstLine", true); process.Set("_breakFirstLine", true);
} }
inspector->Start(platform_.get(), nullptr, options); inspector->Start(platform_, nullptr, options);
} }
} }

4
atom/browser/node_debugger.h
View file

@ -5,8 +5,6 @@
#ifndef ATOM_BROWSER_NODE_DEBUGGER_H_ #ifndef ATOM_BROWSER_NODE_DEBUGGER_H_
#define ATOM_BROWSER_NODE_DEBUGGER_H_ #define ATOM_BROWSER_NODE_DEBUGGER_H_
#include <memory>
#include "base/macros.h" #include "base/macros.h"
namespace node { namespace node {
@ -26,7 +24,7 @@ class NodeDebugger {
private: private:
node::Environment* env_; node::Environment* env_;
std::unique_ptr<node::NodePlatform> platform_; node::NodePlatform* platform_;
DISALLOW_COPY_AND_ASSIGN(NodeDebugger); DISALLOW_COPY_AND_ASSIGN(NodeDebugger);
}; };

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 766932f73a85c22046884081ca65d9475d361d84 Subproject commit d969dd20b689b14e7bbda6be03b361638809ef55