[DevTools] filter any messages from previous session in DevToolsAgentHostImpl

third_party/WebKit/Source/web/WebDevToolsAgentImpl.h

Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
index f3e5a6b7a0f1c32a6edbaa2d795d8742dde97b57..bce3b0b4542132b95731b36b4e4647164d7a22f7 100644
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
@@ -85,7 +85,7 @@ public:
     WebDevToolsAgentClient* client() { return m_client; }
     InspectorOverlay* overlay() const;
     void flushPendingProtocolNotifications();
-    void dispatchMessageFromFrontend(const String& message);
+    void dispatchMessageFromFrontend(int sessionId, const String& message);
     void registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>);
     static void webViewImplClosed(WebViewImpl*);
     static void webFrameWidgetImplClosed(WebFrameWidgetImpl*);
@@ -98,11 +98,11 @@ public:
     void layerTreeViewChanged(WebLayerTreeView*);
 
     // WebDevToolsAgent implementation.
-    void attach(const WebString& hostId) override;
-    void reattach(const WebString& hostId, const WebString& savedState) override;
+    void attach(const WebString& hostId, int sessionId) override;
+    void reattach(const WebString& hostId, int sessionId, const WebString& savedState) override;
     void detach() override;
     void continueProgram() override;
-    void dispatchOnInspectorBackend(const WebString& message) override;
+    void dispatchOnInspectorBackend(int sessionId, const WebString& message) override;
     void inspectElementAt(const WebPoint&) override;
     void evaluateInWebInspector(long callId, const WebString& script) override;
     WebString evaluateInWebInspectorOverlay(const WebString& script) override;
@@ -121,7 +121,7 @@ private:
     void resumeStartup() override;
 
     // InspectorFrontendChannel implementation.
-    void sendProtocolResponse(int callId, PassRefPtr<JSONObject> message) override;
+    void sendProtocolResponse(int sessionId, int callId, PassRefPtr<JSONObject> message) override;
     void sendProtocolNotification(PassRefPtr<JSONObject> message) override;
     void flush() override;
 
@@ -159,8 +159,9 @@ private:
     InspectorAgentRegistry m_agents;
     bool m_deferredAgentsInitialized;
 
-    typedef Vector<RefPtr<JSONObject>> NotificationQueue;
+    typedef Vector<std::pair<int, RefPtr<JSONObject>>> NotificationQueue;
     NotificationQueue m_notificationQueue;
+    int m_sessionId;
     String m_stateCookie;
 
     friend class DebuggerTask;