diff options
author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 08:51:20 +0000 |
---|---|---|
committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 08:51:20 +0000 |
commit | c934ed3d16c3ce6f50346bb365d30b714444db05 (patch) | |
tree | 70032258c8c6260319e084092cea63af1a1f6288 /webkit/glue/devtools/debugger_agent_manager.cc | |
parent | 2fda120d4bff29f5ae85765756e5e47c2a87a260 (diff) | |
download | chromium_src-c934ed3d16c3ce6f50346bb365d30b714444db05.zip chromium_src-c934ed3d16c3ce6f50346bb365d30b714444db05.tar.gz chromium_src-c934ed3d16c3ce6f50346bb365d30b714444db05.tar.bz2 |
Reverting 21635.
Review URL: http://codereview.chromium.org/159399
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/devtools/debugger_agent_manager.cc')
-rw-r--r-- | webkit/glue/devtools/debugger_agent_manager.cc | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/webkit/glue/devtools/debugger_agent_manager.cc b/webkit/glue/devtools/debugger_agent_manager.cc index fafa308..12dd202 100644 --- a/webkit/glue/devtools/debugger_agent_manager.cc +++ b/webkit/glue/devtools/debugger_agent_manager.cc @@ -29,12 +29,6 @@ bool DebuggerAgentManager::in_host_dispatch_handler_ = false; // static DebuggerAgentManager::DeferrersMap DebuggerAgentManager::page_deferrers_; -// static -bool DebuggerAgentManager::in_utility_context_ = false; - -// static -bool DebuggerAgentManager::debug_break_delayed_ = false; - namespace { class CallerIdWrapper : public v8::Debug::ClientData { @@ -163,11 +157,7 @@ void DebuggerAgentManager::DebugBreak(DebuggerAgentImpl* debugger_agent) { #if USE(V8) DCHECK(DebuggerAgentForHostId(debugger_agent->webdevtools_agent()->host_id()) == debugger_agent); - if (in_utility_context_) { - debug_break_delayed_ = true; - } else { - v8::Debug::DebugBreak(); - } + v8::Debug::DebugBreak(); #endif } @@ -211,24 +201,14 @@ void DebuggerAgentManager::OnV8DebugMessage(const v8::Debug::Message& message) { return; } - if (in_utility_context_) { - if (message.GetEvent() == v8::Break) { - // This may happen when two tabs are being debugged in the same process. - // Suppose that first debugger is pauesed on an exception. It will run - // nested MessageLoop which may process Break request from the second - // debugger. - debug_break_delayed_ = true; - } - } else { - // If the context is from one of the inpected tabs or injected extension - // scripts it must have host_id in the data field. - int host_id = WebCore::V8Proxy::contextDebugId(context); - if (host_id != -1) { - DebuggerAgentImpl* agent = DebuggerAgentForHostId(host_id); - if (agent) { - agent->DebuggerOutput(out); - return; - } + // If the context is from one of the inpected tabs or injected extension + // scripts it must have host_id in the data field. + int host_id = WebCore::V8Proxy::contextDebugId(context); + if (host_id != -1) { + DebuggerAgentImpl* agent = DebuggerAgentForHostId(host_id); + if (agent) { + agent->DebuggerOutput(out); + return; } } |