diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 15:40:45 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 15:40:45 +0000 |
| commit | 82a24513a73babfedc349e9aab0dfce342d8a12b (patch) | |
| tree | 374e8a75ff8c4cdcb3ab86456e39e3c9aac53289 /chrome/renderer | |
| parent | 757c492255aa75af8ac76986c67404c68af08def (diff) | |
| download | chromium_src-82a24513a73babfedc349e9aab0dfce342d8a12b.zip chromium_src-82a24513a73babfedc349e9aab0dfce342d8a12b.tar.gz chromium_src-82a24513a73babfedc349e9aab0dfce342d8a12b.tar.bz2 | |
DevTools: Change js flags apply order: first ours, then from command line.
This allows to redefine flags (e.g. 'logfile') for debugging purposes.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_process.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index ba5c37a..2718d37 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -72,18 +72,18 @@ RenderProcess::RenderProcess() } #endif - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kJavaScriptFlags)) { - webkit_glue::SetJavaScriptFlags( - command_line.GetSwitchValue(switches::kJavaScriptFlags)); - } - // Out of process dev tools rely upon auto break behavior. webkit_glue::SetJavaScriptFlags( L"--debugger-auto-break" // Enable lazy in-memory profiling. L" --prof --prof-lazy --logfile=* --compress-log"); + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kJavaScriptFlags)) { + webkit_glue::SetJavaScriptFlags( + command_line.GetSwitchValue(switches::kJavaScriptFlags)); + } + if (command_line.HasSwitch(switches::kEnableWatchdog)) { // TODO(JAR): Need to implement renderer IO msgloop watchdog. } |