Chromium Code Reviews| Index: content/browser/service_worker/embedded_worker_registry.h |
| diff --git a/content/browser/service_worker/embedded_worker_registry.h b/content/browser/service_worker/embedded_worker_registry.h |
| index 8e83b1dabbfd5983cd038d4e62ddbbde1f8730e7..9ae77c4d40d3b4c67326fd38a7a76223dae55424 100644 |
| --- a/content/browser/service_worker/embedded_worker_registry.h |
| +++ b/content/browser/service_worker/embedded_worker_registry.h |
| @@ -18,7 +18,6 @@ |
| #include "content/common/content_export.h" |
| #include "content/common/service_worker/service_worker_status_code.h" |
| -struct EmbeddedWorkerMsg_StartWorker_Params; |
| class GURL; |
| namespace IPC { |
| @@ -29,6 +28,7 @@ class Sender; |
| namespace content { |
| class EmbeddedWorkerInstance; |
| +struct EmbeddedWorkerStartParams; |
| class MessagePortMessageFilter; |
| class ServiceWorkerContextCore; |
| @@ -59,7 +59,7 @@ class CONTENT_EXPORT EmbeddedWorkerRegistry |
| // Called from EmbeddedWorkerInstance, relayed to the child process. |
| ServiceWorkerStatusCode SendStartWorker( |
| - std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params, |
| + std::unique_ptr<EmbeddedWorkerStartParams> params, |
| int process_id); |
| ServiceWorkerStatusCode StopWorker(int process_id, |
| int embedded_worker_id); |
| @@ -114,10 +114,10 @@ class CONTENT_EXPORT EmbeddedWorkerRegistry |
| FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerInstanceTest, |
| RemoveWorkerInSharedProcess); |
| - typedef std::map<int, EmbeddedWorkerInstance*> WorkerInstanceMap; |
| - typedef std::map<int, IPC::Sender*> ProcessToSenderMap; |
| - typedef std::map<int, MessagePortMessageFilter*> |
| - ProcessToMessagePortMessageFilterMap; |
| + using WorkerInstanceMap = std::map<int, EmbeddedWorkerInstance*>; |
| + using ProcessToSenderMap = std::map<int, IPC::Sender*>; |
| + using ProcessToMessagePortMessageFilterMap = |
| + std::map<int, MessagePortMessageFilter*>; |
| EmbeddedWorkerRegistry( |
| const base::WeakPtr<ServiceWorkerContextCore>& context, |
| @@ -126,6 +126,12 @@ class CONTENT_EXPORT EmbeddedWorkerRegistry |
| ServiceWorkerStatusCode Send(int process_id, IPC::Message* message); |
| + // Called when EmbeddedWorkerInstance gets ready for IPC. This function |
|
falken
2016/09/13 05:48:02
english nit: do you mean "is ready for IPC"? "gets
shimazu
2016/09/15 03:24:42
Done.
|
| + // prepares a route to the child worker thread. |
| + // TODO(shimazu): Remove this function once mojofication is completed. |
| + ServiceWorkerStatusCode BindWorkerToProcess(int process_id, |
| + int embedded_worker_id); |
| + |
| // RemoveWorker is called when EmbeddedWorkerInstance is destructed. |
| // |process_id| could be invalid (i.e. ChildProcessHost::kInvalidUniqueID) |
| // if it's not running. |