DevTools: [Blink-side] Fix debugger command order

Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 172 matching lines @@
 class DebuggerTask : public PageScriptDebugServer::Task {
 public:
     DebuggerTask(PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
         : m_descriptor(descriptor)
     {
     }
 
     virtual ~DebuggerTask() { }
     virtual void run()
     {
-        if (WebDevToolsAgent* webagent = m_descriptor->agent())
-            webagent->dispatchOnInspectorBackend(m_descriptor->message());
+        WebDevToolsAgent* webagent = m_descriptor->agent();
+        if (!webagent)
+            return;
+
+        WebDevToolsAgentImpl* agentImpl = static_cast<WebDevToolsAgentImpl*>(webagent);
+        agentImpl->inspectorController()->dispatchMessageFromFrontend(m_descriptor->message());

[pfeldman, 2015/02/17 09:23:16]

check for m_attached is missing.

[yurys, 2015/02/17 09:44:00]

It might make sense to extract

if (m_attached)
    inspectorController()->dispatchMessageFromFrontend(message)

in a separate method.

[sergeyv, 2015/02/17 11:32:59]

Done.

     }
 
 private:
     OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
 };
 
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebViewImpl* webViewImpl,
     WebDevToolsAgentClient* client)
     : m_layerTreeId(0)
@@ skipping 232 matching lines @@
     m_generatingEvent = true;
     WebMouseEvent webEvent = WebMouseEventBuilder(m_webViewImpl->mainFrameImpl()->frameView(), event);
     m_webViewImpl->handleInputEvent(webEvent);
     m_generatingEvent = false;
 }
 
 void WebDevToolsAgentImpl::dispatchOnInspectorBackend(const WebString& message)
 {
     if (!m_attached)
         return;
-    inspectorController()->dispatchMessageFromFrontend(message);
+    if (WebDevToolsAgent::shouldInterruptForMessage(message))
+        PageScriptDebugServer::shared().runPendingTasks();
+    else
+        inspectorController()->dispatchMessageFromFrontend(message);
 }
 
 void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point)
 {
     m_webViewImpl->inspectElementAt(point);
 }
 
 InspectorController* WebDevToolsAgentImpl::inspectorController()
 {
     if (Page* page = m_webViewImpl->page())
@@ skipping 118 matching lines @@
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_removeBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointsActiveCmd);
 }
 
 void WebDevToolsAgent::processPendingMessages()
 {
     PageScriptDebugServer::shared().runPendingTasks();
 }
 
 } // namespace blink