From 7589555cec2369d9206a31b983091695a110d701 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Tue, 4 Sep 2018 11:15:17 +0200 Subject: [PATCH] inspector: stop dragging platform pointer https://github.com/nodejs/node/commit/296fd57324 --- atom/app/node_main.cc | 2 +- atom/browser/atom_browser_main_parts.cc | 2 +- atom/browser/node_debugger.cc | 5 ++--- atom/browser/node_debugger.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc index 9a95165f77a2..af59af226f4e 100644 --- a/atom/app/node_main.cc +++ b/atom/app/node_main.cc @@ -65,7 +65,7 @@ int NodeMain(int argc, char* argv[]) { // Enable support for v8 inspector. NodeDebugger node_debugger(env); - node_debugger.Start(gin_env.platform()); + node_debugger.Start(); mate::Dictionary process(gin_env.isolate(), env->process_object()); #if defined(OS_WIN) diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index cb32a92302a9..6815f9dd94ec 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -144,7 +144,7 @@ void AtomBrowserMainParts::PostEarlyInitialization() { // Enable support for v8 inspector node_debugger_.reset(new NodeDebugger(env)); - node_debugger_->Start(js_env_->platform()); + node_debugger_->Start(); // Add Electron extended APIs. atom_bindings_->BindTo(js_env_->isolate(), env->process_object()); diff --git a/atom/browser/node_debugger.cc b/atom/browser/node_debugger.cc index 1ff179580110..e26e37f5b2f7 100644 --- a/atom/browser/node_debugger.cc +++ b/atom/browser/node_debugger.cc @@ -19,7 +19,7 @@ NodeDebugger::NodeDebugger(node::Environment* env) : env_(env) {} NodeDebugger::~NodeDebugger() {} -void NodeDebugger::Start(node::MultiIsolatePlatform* platform) { +void NodeDebugger::Start() { auto* inspector = env_->inspector_agent(); if (inspector == nullptr) return; @@ -45,8 +45,7 @@ void NodeDebugger::Start(node::MultiIsolatePlatform* platform) { process.Set("_breakFirstLine", true); } - inspector->Start(static_cast(platform), nullptr, - options); + inspector->Start(/* path */ nullptr, options); DCHECK(env_->inspector_agent()->IsStarted()); } diff --git a/atom/browser/node_debugger.h b/atom/browser/node_debugger.h index 06b64584e9a0..be69f9cfd18e 100644 --- a/atom/browser/node_debugger.h +++ b/atom/browser/node_debugger.h @@ -9,7 +9,6 @@ namespace node { class Environment; -class MultiIsolatePlatform; } // namespace node namespace atom { @@ -20,7 +19,7 @@ class NodeDebugger { explicit NodeDebugger(node::Environment* env); ~NodeDebugger(); - void Start(node::MultiIsolatePlatform* platform); + void Start(); private: node::Environment* env_;