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

Source/bindings/core/v8/WorkerScriptDebugServer.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/core/v8/WorkerScriptDebugServer.h"
 
 #include "bindings/core/v8/V8ScriptRunner.h"
-#include "core/inspector/PerIsolateDebuggerClient.h"
 #include "core/inspector/ScriptDebugListener.h"
 #include "core/inspector/WorkerDebuggerAgent.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "wtf/MessageQueue.h"
 #include <v8.h>
 
 namespace blink {
 
 static const char* workerContextDebugId = "[worker]";
 
 WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerGlobalScope* workerGlobalScope)
-    : ScriptDebugServer(v8::Isolate::GetCurrent(), adoptPtr(new PerIsolateDebuggerClient(v8::Isolate::GetCurrent())))
+    : PerIsolateDebuggerClient(v8::Isolate::GetCurrent(), adoptPtr(new ScriptDebugServer(v8::Isolate::GetCurrent(), this)))
     , m_listener(0)
     , m_workerGlobalScope(workerGlobalScope)
 {
 }
 
-DEFINE_TRACE(WorkerScriptDebugServer)
-{
-    visitor->trace(m_workerGlobalScope);
-    ScriptDebugServer::trace(visitor);
-}
-
 void WorkerScriptDebugServer::setContextDebugData(v8::Local<v8::Context> context)
 {
     ScriptDebugServer::setContextDebugData(context, workerContextDebugId);
 }
 
 void WorkerScriptDebugServer::addListener(ScriptDebugListener* listener)
 {
     ASSERT(!m_listener);
-    enable();
+    scriptDebugServer()->enable();
     m_listener = listener;
-    reportCompiledScripts(workerContextDebugId, listener);
+    scriptDebugServer()->reportCompiledScripts(workerContextDebugId, listener);
 }
 
 void WorkerScriptDebugServer::removeListener(ScriptDebugListener* listener)
 {
     ASSERT(m_listener == listener);
-    continueProgram();
+    scriptDebugServer()->continueProgram();
     m_listener = 0;
-    disable();
+    scriptDebugServer()->disable();
 }
 
 ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Local<v8::Context>)
 {
     // There is only one worker context in isolate.
     return m_listener;
 }
 
 void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Local<v8::Context>)
 {
     MessageQueueWaitResult result;
     m_workerGlobalScope->thread()->willEnterNestedLoop();
     do {
         result = m_workerGlobalScope->thread()->runDebuggerTask();
     // Keep waiting until execution is resumed.
-    } while (result == MessageQueueMessageReceived && isPaused());
+    } while (result == MessageQueueMessageReceived && scriptDebugServer()->isPaused());
     m_workerGlobalScope->thread()->didLeaveNestedLoop();
 
     // The listener may have been removed in the nested loop.
     if (m_listener)
         m_listener->didContinue();
 }
 
 void WorkerScriptDebugServer::quitMessageLoopOnPause()
 {
     // Nothing to do here in case of workers since runMessageLoopOnPause will check for paused state after each debugger command.
 }
 
 } // namespace blink