Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(738)

Unified Diff: third_party/WebKit/Source/web/WebDevToolsAgentImpl.h

Issue 2860013002: [DevTools] Support multiple sessions in WebDevToolsAgentImpl (Closed)
Patch Set: zero session id fix Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3d04b7b9fcb051ca37ef90c54bc495fcf8d1fc62..5cb35e102092747e4140b755be36cc971eb601c4 100644
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
@@ -132,8 +132,10 @@ class WebDevToolsAgentImpl final
void WillProcessTask() override;
void DidProcessTask() override;
- void InitializeSession(int session_id, const String& host_id, String* state);
- void DestroySession();
+ InspectorSession* InitializeSession(int session_id,
+ const String& host_id,
+ String* state);
+ void DestroySession(int session_id);
void DispatchMessageFromFrontend(int session_id,
const String& method,
const String& message);
@@ -143,7 +145,7 @@ class WebDevToolsAgentImpl final
int session_id,
std::unique_ptr<WebDevToolsAgent::MessageDescriptor>);
- bool Attached() const { return session_.Get(); }
+ bool Attached() const { return !!sessions_.size(); }
WebDevToolsAgentClient* client_;
Member<WebLocalFrameBase> web_local_frame_impl_;
@@ -152,15 +154,15 @@ class WebDevToolsAgentImpl final
Member<InspectorResourceContentLoader> resource_content_loader_;
Member<InspectedFrames> inspected_frames_;
Member<InspectorResourceContainer> resource_container_;
+ Member<InspectorTraceEvents> trace_events_;
- Member<InspectorPageAgent> page_agent_;
- Member<InspectorNetworkAgent> network_agent_;
- Member<InspectorLayerTreeAgent> layer_tree_agent_;
- Member<InspectorTracingAgent> tracing_agent_;
- Member<InspectorTraceEvents> trace_events_agent_;
- Member<InspectorOverlayAgent> overlay_agent_;
+ HeapHashMap<int, Member<InspectorPageAgent>> page_agents_;
+ HeapHashMap<int, Member<InspectorNetworkAgent>> network_agents_;
+ HeapHashMap<int, Member<InspectorLayerTreeAgent>> layer_tree_agents_;
+ HeapHashMap<int, Member<InspectorTracingAgent>> tracing_agents_;
+ HeapHashMap<int, Member<InspectorOverlayAgent>> overlay_agents_;
- Member<InspectorSession> session_;
+ HeapHashMap<int, Member<InspectorSession>> sessions_;
bool include_view_agents_;
int layer_tree_id_;
};
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698