[DevTools] Dispatch messages to V8InspectorSession directly.

third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h

Index: third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h
index c8cc8237bb5c3d2faebec8b6072eb7d61cf41fbb..fad733eb767775fd88320f27bdb835e33506ff9f 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h
@@ -7,11 +7,12 @@
 
 #include "platform/inspector_protocol/Allocator.h"
 #include "platform/inspector_protocol/Collections.h"
+#include "platform/inspector_protocol/Dispatcher.h"
+#include "platform/inspector_protocol/Frontend.h"
 #include "platform/inspector_protocol/String16.h"
 #include "platform/inspector_protocol/TypeBuilder.h"
 #include "platform/v8_inspector/public/V8InspectorSession.h"
 #include "platform/v8_inspector/public/V8InspectorSessionClient.h"
-#include "platform/v8_inspector/public/V8RuntimeAgent.h"
 #include "wtf/PassOwnPtr.h"
 
 #include <v8.h>
@@ -29,14 +30,14 @@ class V8RuntimeAgentImpl;
 class V8InspectorSessionImpl : public V8InspectorSession {
     PROTOCOL_DISALLOW_COPY(V8InspectorSessionImpl);
 public:
-    static PassOwnPtr<V8InspectorSessionImpl> create(V8DebuggerImpl*, int contextGroupId);
+    static PassOwnPtr<V8InspectorSessionImpl> create(V8DebuggerImpl*, int contextGroupId, V8InspectorSessionClient*, const String16* state);
     ~V8InspectorSessionImpl();
 
     V8DebuggerImpl* debugger() const { return m_debugger; }
     V8InspectorSessionClient* client() const { return m_client; }
-    V8DebuggerAgentImpl* debuggerAgentImpl() { return m_debuggerAgent.get(); }
-    V8ProfilerAgentImpl* profilerAgentImpl() { return m_profilerAgent.get(); }
-    V8RuntimeAgentImpl* runtimeAgentImpl() { return m_runtimeAgent.get(); }
+    V8DebuggerAgentImpl* debuggerAgent() { return m_debuggerAgent.get(); }
+    V8ProfilerAgentImpl* profilerAgent() { return m_profilerAgent.get(); }
+    V8RuntimeAgentImpl* runtimeAgent() { return m_runtimeAgent.get(); }
     int contextGroupId() const { return m_contextGroupId; }
 
     InjectedScript* findInjectedScript(ErrorString*, int contextId);
@@ -48,17 +49,16 @@ public:
     void changeInstrumentationCounter(int delta);
 
     // V8InspectorSession implementation.
-    void setClient(V8InspectorSessionClient*) override;
+    void dispatchProtocolMessage(const String16& message) override;
+    String16 stateJSON() override;
     void addInspectedObject(PassOwnPtr<V8InspectorSession::Inspectable>) override;
-    V8DebuggerAgent* debuggerAgent() override;
-    V8HeapProfilerAgent* heapProfilerAgent() override;
-    V8ProfilerAgent* profilerAgent() override;
-    V8RuntimeAgent* runtimeAgent() override;
     void schedulePauseOnNextStatement(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data) override;
     void cancelPauseOnNextStatement() override;
     void breakProgram(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data) override;
     void breakProgramOnException(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data) override;
     void setSkipAllPauses(bool) override;
+    void resume() override;
+    void stepOver() override;
     void asyncTaskScheduled(const String16& taskName, void* task, bool recurring) override;
     void asyncTaskCanceled(void* task) override;
     void asyncTaskStarted(void* task) override;
@@ -73,7 +73,8 @@ public:
     static const unsigned kInspectedObjectBufferSize = 5;
 
 private:
-    V8InspectorSessionImpl(V8DebuggerImpl*, int contextGroupId);
+    V8InspectorSessionImpl(V8DebuggerImpl*, int contextGroupId, V8InspectorSessionClient*, const String16* state);
+    protocol::DictionaryValue* agentState(const String16& name);
 
     int m_contextGroupId;
     V8DebuggerImpl* m_debugger;
@@ -81,6 +82,10 @@ private:
     bool m_customObjectFormatterEnabled;
     int m_instrumentationCounter;
 
+    OwnPtr<protocol::Frontend> m_frontend;
+    OwnPtr<protocol::Dispatcher> m_dispatcher;
+    OwnPtr<protocol::DictionaryValue> m_state;
+
     OwnPtr<V8RuntimeAgentImpl> m_runtimeAgent;
     OwnPtr<V8DebuggerAgentImpl> m_debuggerAgent;
     OwnPtr<V8HeapProfilerAgentImpl> m_heapProfilerAgent;