Chromium Code Reviews| Index: content/renderer/websharedworker_proxy.h |
| diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h |
| index a1c74a3faf2ac3bb7cee0c2c7de67d4f30947749..7b28cccc6ece50dfaff7054d83b522aa148765bc 100644 |
| --- a/content/renderer/websharedworker_proxy.h |
| +++ b/content/renderer/websharedworker_proxy.h |
| @@ -10,6 +10,7 @@ |
| #include "base/compiler_specific.h" |
| #include "base/macros.h" |
| +#include "content/common/shared_worker.mojom.h" |
| #include "ipc/ipc_listener.h" |
| #include "third_party/WebKit/public/web/WebSharedWorkerConnector.h" |
| #include "url/gurl.h" |
| @@ -29,7 +30,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
| private IPC::Listener { |
| public: |
| // If the worker not loaded yet, route_id == MSG_ROUTING_NONE |
|
kinuko
2017/01/05 08:13:14
(Would be nice to rebase)
nhiroki
2017/01/10 08:44:06
Done.
|
| - WebSharedWorkerProxy(IPC::MessageRouter* router, int route_id); |
| + explicit WebSharedWorkerProxy(int route_id); |
| ~WebSharedWorkerProxy() override; |
| // Implementations of WebSharedWorkerConnector APIs |
| @@ -45,7 +46,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
| // Sends a message to the worker thread (forwarded via the RenderViewHost). |
| // If WorkerStarted() has not yet been called, message is queued. |
| - bool Send(std::unique_ptr<IPC::Message> message); |
| + bool Send(int message_port_id); |
|
shimazu
2017/01/05 02:24:03
How about renaming to TryToSendConnectToWorker to
nhiroki
2017/01/10 08:44:06
This function was removed by other cleanup CLs.
|
| // Sends any messages currently in the queue. |
| void SendQueuedMessages(); |
| @@ -63,7 +64,9 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
| IPC::MessageRouter* const router_; |
| // Stores messages that were sent before the StartWorkerContext message. |
| - std::vector<std::unique_ptr<IPC::Message>> queued_messages_; |
| + std::vector<int> queued_messages_; |
|
shimazu
2017/01/05 02:24:03
I prefer |queued_connect_request_| or something to
nhiroki
2017/01/10 08:44:06
Queuing mechanism was removed by other cleanup CLs
|
| + |
| + mojom::SharedWorkerMessageFilterAssociatedPtr message_filter_; |
| ConnectListener* connect_listener_; |
| bool created_; |