Index: content/renderer/shared_worker/embedded_shared_worker_stub.h |
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h |
index 3f0c25075fe7015a1d641aba209ef0717da4b079..f1a01f49795fc4147bc00842c5da0ad9fe8d4599 100644 |
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.h |
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h |
@@ -28,6 +28,7 @@ class WebWorkerContentSettingsClientProxy; |
} |
namespace content { |
+class MessagePort; |
class SharedWorkerDevToolsAgent; |
class WebApplicationCacheHostImpl; |
class WebMessagePortChannelImpl; |
@@ -87,9 +88,11 @@ class EmbeddedSharedWorkerStub : public IPC::Listener, |
bool Send(IPC::Message* message); |
// WebSharedWorker will own |channel|. |
- void ConnectToChannel(WebMessagePortChannelImpl* channel); |
+ void ConnectToChannel(int connection_request_id, |
+ std::unique_ptr<WebMessagePortChannelImpl> channel); |
- void OnConnect(int sent_message_port_id, int routing_id); |
+ void OnConnect(int connection_request_id, |
+ const MessagePort& sent_message_port); |
void OnTerminateWorkerContext(); |
int route_id_; |
@@ -99,8 +102,9 @@ class EmbeddedSharedWorkerStub : public IPC::Listener, |
blink::WebSharedWorker* impl_ = nullptr; |
std::unique_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_; |
- typedef std::vector<WebMessagePortChannelImpl*> PendingChannelList; |
- PendingChannelList pending_channels_; |
+ using PendingChannel = std::pair<int /* connection_request_id */, |
+ std::unique_ptr<WebMessagePortChannelImpl>>; |
+ std::vector<PendingChannel> pending_channels_; |
ScopedChildProcessReference process_ref_; |
WebApplicationCacheHostImpl* app_cache_host_ = nullptr; |