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

Source/bindings/core/v8/PageScriptDebugServer.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 25 matching lines @@
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
-#include "core/inspector/PerIsolateDebuggerClient.h"
 #include "core/inspector/ScriptDebugListener.h"
 #include "core/page/Page.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/TemporaryChange.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 static LocalFrame* retrieveFrameWithGlobalObjectCheck(v8::Local<v8::Context> context)
 {
     return toLocalFrame(toFrameIfNotDetached(context));
 }
 
 PageScriptDebugServer* PageScriptDebugServer::s_instance = nullptr;
 
 PageScriptDebugServer::PageScriptDebugServer(PassOwnPtr<ClientMessageLoop> clientMessageLoop, v8::Isolate* isolate)
-    : ScriptDebugServer(isolate, adoptPtr(new PerIsolateDebuggerClient(isolate)))
+    : PerIsolateDebuggerClient(isolate, adoptPtr(new ScriptDebugServer(isolate, this)))
     , m_clientMessageLoop(clientMessageLoop)
     , m_pausedFrame(nullptr)
 {
     MutexLocker locker(creationMutex());
     ASSERT(!s_instance);
     s_instance = this;
 }
 
 PageScriptDebugServer::~PageScriptDebugServer()
 {
     MutexLocker locker(creationMutex());
     ASSERT(s_instance == this);
     s_instance = nullptr;
 }
 
 Mutex& PageScriptDebugServer::creationMutex()
 {
     AtomicallyInitializedStaticReference(Mutex, mutex, (new Mutex));
     return mutex;
 }
 
-DEFINE_TRACE(PageScriptDebugServer)
-{
-#if ENABLE(OILPAN)
-    visitor->trace(m_listenersMap);
-    visitor->trace(m_pausedFrame);
-#endif
-    ScriptDebugServer::trace(visitor);
-}
-
 void PageScriptDebugServer::setContextDebugData(v8::Local<v8::Context> context, const String& type, int contextDebugId)
 {
     String debugData = "[" + type + "," + String::number(contextDebugId) + "]";
     ScriptDebugServer::setContextDebugData(context, debugData);
 }
 
 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, LocalFrame* localFrameRoot, int contextDebugId)
 {
     ASSERT(localFrameRoot == localFrameRoot->localFrameRoot());
 
     ScriptController& scriptController = localFrameRoot->script();
     if (!scriptController.canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     if (m_listenersMap.isEmpty())
-        enable();
+        scriptDebugServer()->enable();
     m_listenersMap.set(localFrameRoot, listener);
     String contextDataSubstring = "," + String::number(contextDebugId) + "]";
-    reportCompiledScripts(contextDataSubstring, listener);
+    scriptDebugServer()->reportCompiledScripts(contextDataSubstring, listener);
 }
 
 void PageScriptDebugServer::removeListener(ScriptDebugListener* listener, LocalFrame* localFrame)
 {
     if (!m_listenersMap.contains(localFrame))
         return;
 
     if (m_pausedFrame == localFrame)
-        continueProgram();
+        scriptDebugServer()->continueProgram();
 
     m_listenersMap.remove(localFrame);
 
     if (m_listenersMap.isEmpty())
-        disable();
+        scriptDebugServer()->disable();
 }
 
 PageScriptDebugServer* PageScriptDebugServer::instance()
 {
     ASSERT(isMainThread());
     return s_instance;
 }
 
-void PageScriptDebugServer::interruptMainThreadAndRun(PassOwnPtr<Task> task)
+void PageScriptDebugServer::interruptMainThreadAndRun(PassOwnPtr<ScriptDebugServer::Task> task)
 {
     MutexLocker locker(creationMutex());
     if (s_instance)
-        s_instance->interruptAndRun(task);
+        s_instance->scriptDebugServer()->interruptAndRun(task);
 }
 
 ScriptDebugListener* PageScriptDebugServer::getDebugListenerForContext(v8::Local<v8::Context> context)
 {
     v8::HandleScope scope(context->GetIsolate());
     LocalFrame* frame = retrieveFrameWithGlobalObjectCheck(context);
     if (!frame)
         return 0;
     return m_listenersMap.get(frame->localFrameRoot());
 }
@@ skipping 13 matching lines @@
 
     m_pausedFrame = 0;
 }
 
 void PageScriptDebugServer::quitMessageLoopOnPause()
 {
     m_clientMessageLoop->quitNow();
 }
 
 } // namespace blink