Devtools: Move runMessageLoopOnPause and other methods on ScriptDebugServer::Client

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 119 matching lines @@
     static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget)
     {
         if (s_instance)
             s_instance->m_frozenWidgets.remove(widget);
     }
 
     static void continueProgram()
     {
         // Release render thread if necessary.
         if (s_instance && s_instance->m_running)
-            PageScriptDebugServer::instance()->continueProgram();
+            PageScriptDebugServer::instance()->scriptDebugServer()->continueProgram();
     }
 
 private:
     ClientMessageLoopAdapter(PassOwnPtr<WebDevToolsAgentClient::WebKitClientMessageLoop> messageLoop)
         : m_running(false)
         , m_messageLoop(messageLoop) { }
 
     void run(LocalFrame* frame) override
     {
         if (m_running)
@@ skipping 91 matching lines @@
         UseCounter::muteForInspector();
     }
 
     void unmuteWarningsAndDeprecations()
     {
         FrameConsole::unmute();
         UseCounter::unmuteForInspector();
     }
 };
 
-class DebuggerTask : public PageScriptDebugServer::Task {
+class DebuggerTask : public ScriptDebugServer::Task {
 public:
     DebuggerTask(PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
         : m_descriptor(descriptor)
     {
     }
 
     virtual ~DebuggerTask() { }
     virtual void run()
     {
         WebDevToolsAgent* webagent = m_descriptor->agent();
@@ skipping 78 matching lines @@
 
     OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_pageAgent));
     m_layerTreeAgent = layerTreeAgentPtr.get();
     m_agents.append(layerTreeAgentPtr.release());
 
     m_agents.append(InspectorTimelineAgent::create());
 
     ClientMessageLoopAdapter::ensurePageScriptDebugServerCreated(m_client);
     PageScriptDebugServer* scriptDebugServer = PageScriptDebugServer::instance();
 
-    OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, scriptDebugServer, m_pageAgent));
+    OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, scriptDebugServer->scriptDebugServer(), m_pageAgent));
     m_pageRuntimeAgent = pageRuntimeAgentPtr.get();
     m_agents.append(pageRuntimeAgentPtr.release());
 
     OwnPtrWillBeRawPtr<PageConsoleAgent> pageConsoleAgentPtr = PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_pageAgent);
     m_pageConsoleAgent = pageConsoleAgentPtr.get();
 
     OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAgent::create(pageConsoleAgentPtr.get());
 
     OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(this, workerAgentPtr.get(), m_pageAgent);
     m_tracingAgent = tracingAgentPtr.get();
@@ skipping 101 matching lines @@
 
     m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager));
 
     m_pageAgent->setDeferredAgents(debuggerAgent, m_cssAgent);
 
     PageScriptDebugServer* scriptDebugServer = PageScriptDebugServer::instance();
     m_injectedScriptManager->injectedScriptHost()->init(
         m_pageConsoleAgent.get(),
         debuggerAgent,
         bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObject>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()),
-        scriptDebugServer,
+        scriptDebugServer->scriptDebugServer(),
         adoptPtr(new PageInjectedScriptHostClient()));
 }
 
 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
 {
     m_agents.append(agent);
 }
 
 void WebDevToolsAgentImpl::attach(const WebString& hostId)
 {
@@ skipping 142 matching lines @@
 void WebDevToolsAgentImpl::disableTracing()
 {
     m_client->disableTracing();
 }
 
 void WebDevToolsAgentImpl::dispatchOnInspectorBackend(const WebString& message)
 {
     if (!m_attached)
         return;
     if (WebDevToolsAgent::shouldInterruptForMessage(message))
-        PageScriptDebugServer::instance()->runPendingTasks();
+        PageScriptDebugServer::instance()->scriptDebugServer()->runPendingTasks();
     else
         dispatchMessageFromFrontend(message);
 }
 
 void WebDevToolsAgentImpl::dispatchMessageFromFrontend(const String& message)
 {
     if (m_inspectorBackendDispatcher)
         m_inspectorBackendDispatcher->dispatch(message);
 }
 
@@ skipping 94 matching lines @@
     if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_pauseCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointByUrlCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_removeBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointsActiveCmd);
 }
 
 } // namespace blink