Browse Source

Fix linking problem with NodePlatform

Cheng Zhao 7 years ago
parent
commit
3138c85218
3 changed files with 6 additions and 7 deletions
  1. 4 3
      atom/browser/node_debugger.cc
  2. 1 3
      atom/browser/node_debugger.h
  3. 1 1
      vendor/node

+ 4 - 3
atom/browser/node_debugger.cc

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

+ 1 - 3
atom/browser/node_debugger.h

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

+ 1 - 1
vendor/node

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