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

Source/core/inspector/PageDebuggerAgent.cpp

 /*
  * Copyright (C) 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 40 matching lines @@
 using blink::TypeBuilder::Runtime::RemoteObject;
 
 namespace blink {
 
 PassOwnPtrWillBeRawPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
 {
     return adoptPtrWillBeNoop(new PageDebuggerAgent(pageScriptDebugServer, pageAgent, injectedScriptManager, overlay, debuggerId));
 }
 
 PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay, int debuggerId)
-    : InspectorDebuggerAgent(injectedScriptManager, pageScriptDebugServer->isolate())
+    : InspectorDebuggerAgent(injectedScriptManager, pageScriptDebugServer->scriptDebugServer()->isolate())
     , m_pageScriptDebugServer(pageScriptDebugServer)
     , m_pageAgent(pageAgent)
     , m_overlay(overlay)
     , m_debuggerId(debuggerId)
 {
     m_overlay->setListener(this);
 }
 
 PageDebuggerAgent::~PageDebuggerAgent()
 {
@@ skipping 31 matching lines @@
 
 void PageDebuggerAgent::disable()
 {
     InspectorDebuggerAgent::disable();
     m_instrumentingAgents->setPageDebuggerAgent(0);
     m_compiledScriptURLs.clear();
 }
 
 void PageDebuggerAgent::startListeningScriptDebugServer()
 {
-    scriptDebugServer().addListener(this, m_pageAgent->inspectedFrame(), m_debuggerId);
+    m_pageScriptDebugServer->addListener(this, m_pageAgent->inspectedFrame(), m_debuggerId);
 }
 
 void PageDebuggerAgent::stopListeningScriptDebugServer()
 {
-    scriptDebugServer().removeListener(this, m_pageAgent->inspectedFrame());
+    m_pageScriptDebugServer->removeListener(this, m_pageAgent->inspectedFrame());
 }
 
-PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
+ScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
 {
-    return *m_pageScriptDebugServer;
+    return *(m_pageScriptDebugServer->scriptDebugServer());
 }
 
 void PageDebuggerAgent::muteConsole()
 {
     FrameConsole::mute();
 }
 
 void PageDebuggerAgent::unmuteConsole()
 {
     FrameConsole::unmute();
@@ skipping 84 matching lines @@
     RefPtrWillBeRawPtr<LocalFrame> protect(frame);
     InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails);
 
     if (frame)
         InspectorInstrumentation::didEvaluateScript(cookie);
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
 
 }
 
 } // namespace blink