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

Source/bindings/core/v8/PageScriptDebugServer.h

 /*
  * 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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.
  */
 
 #ifndef PageScriptDebugServer_h
 #define PageScriptDebugServer_h
 
-#include "bindings/core/v8/ScriptDebugServer.h"
 #include "core/CoreExport.h"
+#include "core/inspector/PerIsolateDebuggerClient.h"
 #include <v8.h>
 
 namespace WTF {
 class Mutex;
 }
 
 namespace blink {
 
 class Page;
 
-class CORE_EXPORT PageScriptDebugServer final : public ScriptDebugServer {
+class CORE_EXPORT PageScriptDebugServer final : public PerIsolateDebuggerClient {
     WTF_MAKE_NONCOPYABLE(PageScriptDebugServer);
 public:
     class ClientMessageLoop {
     public:
         virtual ~ClientMessageLoop() { }
         virtual void run(LocalFrame*) = 0;
         virtual void quitNow() = 0;
     };
 
     PageScriptDebugServer(PassOwnPtr<ClientMessageLoop>, v8::Isolate*);
     ~PageScriptDebugServer() override;
-    DECLARE_VIRTUAL_TRACE();

[yurys, 2015/05/08 10:59:15]

This will likely need some work to fix Oilpan.

[sergeyv, 2015/05/08 13:59:14]

Acknowledged.

 
     static void setContextDebugData(v8::Local<v8::Context>, const String& type, int contextDebugId);
     void addListener(ScriptDebugListener*, LocalFrame*, int contextDebugId);
     void removeListener(ScriptDebugListener*, LocalFrame*);
 
     static PageScriptDebugServer* instance();
-    static void interruptMainThreadAndRun(PassOwnPtr<Task>);
+    static void interruptMainThreadAndRun(PassOwnPtr<ScriptDebugServer::Task>);
 
-private:

[yurys, 2015/05/08 10:59:15]

Please revert this. No need to make these methods public on
PageScriptDebugServer.

[sergeyv, 2015/05/08 13:59:14]

Done.

     ScriptDebugListener* getDebugListenerForContext(v8::Local<v8::Context>) override;
     void runMessageLoopOnPause(v8::Local<v8::Context>) override;
     void quitMessageLoopOnPause() override;
+
+private:
     static WTF::Mutex& creationMutex();
 
     using ListenersMap = WillBeHeapHashMap<RawPtrWillBeMember<LocalFrame>, ScriptDebugListener*>;
     ListenersMap m_listenersMap;
     OwnPtr<ClientMessageLoop> m_clientMessageLoop;
     RawPtrWillBeMember<LocalFrame> m_pausedFrame;
 
     static PageScriptDebugServer* s_instance;
 };
 
 } // namespace blink
 
 
 #endif // PageScriptDebugServer_h