Merge pull request #9436 from electron/debug-crash
Remove support for --debug/--debug-brk
This commit is contained in:
commit
e708a45496
3 changed files with 0 additions and 16 deletions
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#include "atom/app/uv_task_runner.h"
|
#include "atom/app/uv_task_runner.h"
|
||||||
#include "atom/browser/javascript_environment.h"
|
#include "atom/browser/javascript_environment.h"
|
||||||
#include "atom/browser/node_debugger.h"
|
|
||||||
#include "atom/common/api/atom_bindings.h"
|
#include "atom/common/api/atom_bindings.h"
|
||||||
#include "atom/common/crash_reporter/crash_reporter.h"
|
#include "atom/common/crash_reporter/crash_reporter.h"
|
||||||
#include "atom/common/native_mate_converters/string16_converter.h"
|
#include "atom/common/native_mate_converters/string16_converter.h"
|
||||||
|
@ -51,11 +50,6 @@ int NodeMain(int argc, char *argv[]) {
|
||||||
&isolate_data, gin_env.context(), argc, argv,
|
&isolate_data, gin_env.context(), argc, argv,
|
||||||
exec_argc, exec_argv);
|
exec_argc, exec_argv);
|
||||||
|
|
||||||
// Start our custom debugger implementation.
|
|
||||||
NodeDebugger node_debugger(gin_env.isolate());
|
|
||||||
if (node_debugger.IsRunning())
|
|
||||||
env->AssignToContext(v8::Debug::GetDebugContext(gin_env.isolate()));
|
|
||||||
|
|
||||||
mate::Dictionary process(gin_env.isolate(), env->process_object());
|
mate::Dictionary process(gin_env.isolate(), env->process_object());
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
process.SetMethod("log", &AtomBindings::Log);
|
process.SetMethod("log", &AtomBindings::Log);
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "atom/browser/bridge_task_runner.h"
|
#include "atom/browser/bridge_task_runner.h"
|
||||||
#include "atom/browser/browser.h"
|
#include "atom/browser/browser.h"
|
||||||
#include "atom/browser/javascript_environment.h"
|
#include "atom/browser/javascript_environment.h"
|
||||||
#include "atom/browser/node_debugger.h"
|
|
||||||
#include "atom/common/api/atom_bindings.h"
|
#include "atom/common/api/atom_bindings.h"
|
||||||
#include "atom/common/asar/asar_util.h"
|
#include "atom/common/asar/asar_util.h"
|
||||||
#include "atom/common/node_bindings.h"
|
#include "atom/common/node_bindings.h"
|
||||||
|
@ -129,18 +128,11 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
|
||||||
|
|
||||||
node_bindings_->Initialize();
|
node_bindings_->Initialize();
|
||||||
|
|
||||||
// Support the "--debug" switch.
|
|
||||||
node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
|
|
||||||
|
|
||||||
// Create the global environment.
|
// Create the global environment.
|
||||||
node::Environment* env =
|
node::Environment* env =
|
||||||
node_bindings_->CreateEnvironment(js_env_->context());
|
node_bindings_->CreateEnvironment(js_env_->context());
|
||||||
node_env_.reset(new NodeEnvironment(env));
|
node_env_.reset(new NodeEnvironment(env));
|
||||||
|
|
||||||
// Make sure node can get correct environment when debugging.
|
|
||||||
if (node_debugger_->IsRunning())
|
|
||||||
env->AssignToContext(v8::Debug::GetDebugContext(js_env_->isolate()));
|
|
||||||
|
|
||||||
// Add Electron extended APIs.
|
// Add Electron extended APIs.
|
||||||
atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
|
atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ class AtomBindings;
|
||||||
class Browser;
|
class Browser;
|
||||||
class JavascriptEnvironment;
|
class JavascriptEnvironment;
|
||||||
class NodeBindings;
|
class NodeBindings;
|
||||||
class NodeDebugger;
|
|
||||||
class NodeEnvironment;
|
class NodeEnvironment;
|
||||||
class BridgeTaskRunner;
|
class BridgeTaskRunner;
|
||||||
|
|
||||||
|
@ -83,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<NodeEnvironment> node_env_;
|
std::unique_ptr<NodeEnvironment> node_env_;
|
||||||
std::unique_ptr<NodeDebugger> node_debugger_;
|
|
||||||
|
|
||||||
base::Timer gc_timer_;
|
base::Timer gc_timer_;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue