Chromium Code Reviews| Index: Source/bindings/core/v8/PageScriptDebugServer.h |
| diff --git a/Source/bindings/core/v8/PageScriptDebugServer.h b/Source/bindings/core/v8/PageScriptDebugServer.h |
| index 0f342e944c4782829d44944ab560e38503da06b2..0dfefe65343464b01af27cf05e608c5674f5bd4d 100644 |
| --- a/Source/bindings/core/v8/PageScriptDebugServer.h |
| +++ b/Source/bindings/core/v8/PageScriptDebugServer.h |
| @@ -31,8 +31,8 @@ |
| #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 { |
| @@ -43,7 +43,7 @@ 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 { |
| @@ -55,19 +55,19 @@ public: |
| 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
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*>; |