| Index: third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| index dd45a5bf03303d38cc36013206d481ab2788d4a9..64313fa7bacdf49e1119ddcda33e5895f65b4287 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| @@ -10,6 +10,7 @@
|
| #include "core/workers/WorkerThread.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/wtf/Forward.h"
|
| +#include "platform/wtf/HashMap.h"
|
|
|
| namespace blink {
|
|
|
| @@ -30,21 +31,22 @@ class CORE_EXPORT WorkerInspectorProxy final
|
| public:
|
| virtual ~PageInspector() {}
|
| virtual void DispatchMessageFromWorker(WorkerInspectorProxy*,
|
| - const String&) = 0;
|
| + int session_id,
|
| + const String& message) = 0;
|
| };
|
|
|
| WorkerThreadStartMode WorkerStartMode(ExecutionContext*);
|
| void WorkerThreadCreated(ExecutionContext*, WorkerThread*, const KURL&);
|
| void WorkerThreadTerminated();
|
| - void DispatchMessageFromWorker(const String&);
|
| + void DispatchMessageFromWorker(int session_id, const String&);
|
| void AddConsoleMessageFromWorker(MessageLevel,
|
| const String& message,
|
| std::unique_ptr<SourceLocation>);
|
|
|
| - void ConnectToInspector(PageInspector*);
|
| - void DisconnectFromInspector(PageInspector*);
|
| - void SendMessageToInspector(const String&);
|
| - void WriteTimelineStartedEvent(const String& session_id);
|
| + void ConnectToInspector(int session_id, PageInspector*);
|
| + void DisconnectFromInspector(int session_id, PageInspector*);
|
| + void SendMessageToInspector(int session_id, const String& message);
|
| + void WriteTimelineStartedEvent(const String& tracing_session_id);
|
|
|
| const String& Url() { return url_; }
|
| ExecutionContext* GetExecutionContext() { return execution_context_; }
|
| @@ -59,7 +61,7 @@ class CORE_EXPORT WorkerInspectorProxy final
|
|
|
| WorkerThread* worker_thread_;
|
| Member<ExecutionContext> execution_context_;
|
| - PageInspector* page_inspector_;
|
| + HashMap<int, PageInspector*> page_inspectors_;
|
| String url_;
|
| String inspector_id_;
|
| };
|
|
|