DevTools: make pause work for script evaluations

webkit/glue/devtools/debugger_agent_manager.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "Frame.h"
 #include "PageGroupLoadDeferrer.h"
 #include "V8Proxy.h"
 #include <wtf/HashSet.h>
@@ skipping 11 matching lines @@
 
 WebDevToolsAgent::MessageLoopDispatchHandler
     DebuggerAgentManager::message_loop_dispatch_handler_ = NULL;
 
 // static
 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 {
  public:
   CallerIdWrapper() : caller_is_mananager_(true), caller_id_(0) {}
   explicit CallerIdWrapper(int caller_id)
     : caller_is_mananager_(false),
       caller_id_(caller_id) {}
   ~CallerIdWrapper() {}
   bool caller_is_mananager() const { return caller_is_mananager_; }
@@ skipping 108 matching lines @@
       SendContinueCommandToV8();
     }
   }
 }
 
 // static
 void DebuggerAgentManager::DebugBreak(DebuggerAgentImpl* debugger_agent) {
 #if USE(V8)
   DCHECK(DebuggerAgentForHostId(debugger_agent->webdevtools_agent()->host_id())
              == debugger_agent);
-  v8::Debug::DebugBreak();
+  if (in_utility_context_) {
+    debug_break_delayed_ = true;
+  } else {
+    v8::Debug::DebugBreak();
+  }
 #endif
 }
 
 // static
 void DebuggerAgentManager::OnV8DebugMessage(const v8::Debug::Message& message) {
   v8::HandleScope scope;
   v8::String::Utf8Value value(message.GetJSON());
   std::string out(*value, value.length());
 
   // If caller_data is not NULL the message is a response to a debugger command.
@@ skipping 23 matching lines @@
   }
 
   v8::Handle<v8::Context> context = message.GetEventContext();
   // If the context is from one of the inpected tabs it should have its context
   // data.
   if (context.IsEmpty()) {
     // Unknown context, skip the event.
     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;
+  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 (!message.WillStartRunning()) {
     // Autocontinue execution on break and exception  events if there is no
     // handler.
     SendContinueCommandToV8();
   }
 }
 
@@ skipping 71 matching lines @@
   return NULL;
 }
 
 // static
 DebuggerAgentImpl* DebuggerAgentManager::DebuggerAgentForHostId(int host_id) {
   if (!attached_agents_map_) {
     return NULL;
   }
   return attached_agents_map_->get(host_id);
 }