[DevTools] Dispatch messages to V8InspectorSession directly.

third_party/WebKit/Source/core/inspector/InspectorSession.h

Index: third_party/WebKit/Source/core/inspector/InspectorSession.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorSession.h b/third_party/WebKit/Source/core/inspector/InspectorSession.h
index 733ae5513a5d6f89b3cc378aff9c293c837b695e..0bef2314fdda1fc17cd917d72bf360a7570a2dd7 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorSession.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorSession.h
@@ -24,11 +24,11 @@ class InspectedFrames;
 class InspectorAgent;
 class InstrumentingAgents;
 class LocalFrame;
+class V8Debugger;
 class V8InspectorSession;
 
 class CORE_EXPORT InspectorSession
     : public GarbageCollectedFinalized<InspectorSession>
-    , WTF_NON_EXPORTED_BASE(public protocol::FrontendChannel)
     , public V8InspectorSessionClient {
     WTF_MAKE_NONCOPYABLE(InspectorSession);
 public:
@@ -41,15 +41,17 @@ public:
         virtual ~Client() {}
     };
 
-    InspectorSession(Client*, InspectedFrames*, InstrumentingAgents*, int sessionId, bool autoFlush);
+    InspectorSession(Client*, InspectedFrames*, InstrumentingAgents*, int sessionId, bool autoFlush, V8Debugger*, int contextGroupId, const String* savedState);
+    ~InspectorSession() override;
     int sessionId() { return m_sessionId; }
+    V8InspectorSession* v8Session() { return m_v8Session.get(); }
 
     void append(InspectorAgent*);
-    void attach(V8InspectorSession*, const String* savedState);
-    void detach();
+    void restore();
+    void dispose();
     void didCommitLoadForLocalFrame(LocalFrame*);
-    void dispatchProtocolMessage(const String& message);
-    void flushPendingProtocolNotifications();
+    void dispatchProtocolMessage(const String& method, const String& message);
+    void flushProtocolNotifications() override;
 
     // Instrumentation methods marked by [V8]
     void scriptExecutionBlockedByCSP(const String& directiveText);
@@ -66,9 +68,8 @@ public:
 
 private:
     // protocol::FrontendChannel implementation.
-    void sendProtocolResponse(int sessionId, int callId, PassOwnPtr<protocol::DictionaryValue> message) override;
-    void sendProtocolNotification(PassOwnPtr<protocol::DictionaryValue> message) override;
-    void flush();
+    void sendProtocolResponse(int callId, const protocol::String16& message) override;
+    void sendProtocolNotification(const protocol::String16& message) override;
 
     // V8InspectorSessionClient implementation.
     void startInstrumenting() override;
@@ -79,22 +80,20 @@ private:
     void profilingStopped() override;
 
     void forceContextsInAllFrames();
-#if ENABLE(ASSERT)
     bool isInstrumenting();
-#endif
 
     Client* m_client;
-    V8InspectorSession* m_v8Session;
+    OwnPtr<V8InspectorSession> m_v8Session;
     int m_sessionId;
     bool m_autoFlush;
-    bool m_attached;
+    bool m_disposed;
     Member<InspectedFrames> m_inspectedFrames;
     Member<InstrumentingAgents> m_instrumentingAgents;
     OwnPtr<protocol::Frontend> m_inspectorFrontend;
     OwnPtr<protocol::Dispatcher> m_inspectorBackendDispatcher;
     OwnPtr<protocol::DictionaryValue> m_state;
     HeapVector<Member<InspectorAgent>> m_agents;
-    Vector<OwnPtr<protocol::DictionaryValue>> m_notificationQueue;
+    Vector<protocol::String16> m_notificationQueue;
     String m_lastSentState;
 };