summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 09:09:14 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 09:09:14 +0000
commit84d231e748ee933e7a26d683a01d328d6a76a061 (patch)
tree9d16c0a48a7fb1a132e89b3470ad209ec0b44355 /chrome/renderer
parent74f0c4d29b271edfcd97e6bbe4417cc0ef139c30 (diff)
downloadchromium_src-84d231e748ee933e7a26d683a01d328d6a76a061.zip
chromium_src-84d231e748ee933e7a26d683a01d328d6a76a061.tar.gz
chromium_src-84d231e748ee933e7a26d683a01d328d6a76a061.tar.bz2
DevTools: enable out of process dev tools by default.
Review URL: http://codereview.chromium.org/115231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/devtools_agent_filter.cc4
-rw-r--r--chrome/renderer/render_process.cc5
-rw-r--r--chrome/renderer/render_view.cc4
3 files changed, 9 insertions, 4 deletions
diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc
index 13b76f4..859c69f 100644
--- a/chrome/renderer/devtools_agent_filter.cc
+++ b/chrome/renderer/devtools_agent_filter.cc
@@ -25,8 +25,8 @@ void DevToolsAgentFilter::DispatchMessageLoop() {
DevToolsAgentFilter::DevToolsAgentFilter()
: current_routing_id_(0) {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- devtools_enabled_ = command_line.HasSwitch(
- switches::kEnableOutOfProcessDevTools);
+ devtools_enabled_ = !command_line.HasSwitch(
+ switches::kDisableOutOfProcessDevTools);
if (devtools_enabled_) {
WebDevToolsAgent::SetMessageLoopDispatchHandler(
&DevToolsAgentFilter::DispatchMessageLoop);
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index c6ac565..94d353e 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -98,6 +98,11 @@ void RenderProcess::Init() {
command_line.GetSwitchValue(switches::kJavaScriptFlags));
}
+ if (!command_line.HasSwitch(switches::kDisableOutOfProcessDevTools)) {
+ // Out of process dev tools rely upon auto break behavior.
+ webkit_glue::SetJavaScriptFlags(L"--debugger-auto-break");
+ }
+
if (command_line.HasSwitch(switches::kEnableWatchdog)) {
// TODO(JAR): Need to implement renderer IO msgloop watchdog.
}
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 5e573fa..d28faa7 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -291,8 +291,8 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- bool dev_tools_enabled = command_line.HasSwitch(
- switches::kEnableOutOfProcessDevTools);
+ bool dev_tools_enabled = !command_line.HasSwitch(
+ switches::kDisableOutOfProcessDevTools);
if (dev_tools_enabled)
devtools_agent_.reset(new DevToolsAgent(routing_id, this));