OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/service_worker/embedded_worker_context_client.h" | 5 #include "content/renderer/service_worker/embedded_worker_context_client.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "base/pickle.h" | 9 #include "base/pickle.h" |
10 #include "base/threading/thread_local.h" | 10 #include "base/threading/thread_local.h" |
11 #include "content/child/thread_safe_sender.h" | 11 #include "content/child/thread_safe_sender.h" |
| 12 #include "content/child/worker_task_runner.h" |
12 #include "content/child/worker_thread_task_runner.h" | 13 #include "content/child/worker_thread_task_runner.h" |
13 #include "content/common/service_worker/embedded_worker_messages.h" | 14 #include "content/common/service_worker/embedded_worker_messages.h" |
14 #include "content/renderer/render_thread_impl.h" | 15 #include "content/renderer/render_thread_impl.h" |
15 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 16 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
16 #include "content/renderer/service_worker/service_worker_script_context.h" | 17 #include "content/renderer/service_worker/service_worker_script_context.h" |
17 #include "ipc/ipc_message_macros.h" | 18 #include "ipc/ipc_message_macros.h" |
18 #include "third_party/WebKit/public/platform/WebString.h" | 19 #include "third_party/WebKit/public/platform/WebString.h" |
19 #include "webkit/child/worker_task_runner.h" | |
20 | |
21 using webkit_glue::WorkerTaskRunner; | |
22 | 20 |
23 namespace content { | 21 namespace content { |
24 | 22 |
25 namespace { | 23 namespace { |
26 | 24 |
27 // For now client must be a per-thread instance. | 25 // For now client must be a per-thread instance. |
28 // TODO(kinuko): This needs to be refactored when we start using thread pool | 26 // TODO(kinuko): This needs to be refactored when we start using thread pool |
29 // or having multiple clients per one thread. | 27 // or having multiple clients per one thread. |
30 base::LazyInstance<base::ThreadLocalPointer<EmbeddedWorkerContextClient> >:: | 28 base::LazyInstance<base::ThreadLocalPointer<EmbeddedWorkerContextClient> >:: |
31 Leaky g_worker_client_tls = LAZY_INSTANCE_INITIALIZER; | 29 Leaky g_worker_client_tls = LAZY_INSTANCE_INITIALIZER; |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 } | 130 } |
133 | 131 |
134 void EmbeddedWorkerContextClient::SendWorkerStarted() { | 132 void EmbeddedWorkerContextClient::SendWorkerStarted() { |
135 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 133 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
136 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted( | 134 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted( |
137 WorkerTaskRunner::Instance()->CurrentWorkerId(), | 135 WorkerTaskRunner::Instance()->CurrentWorkerId(), |
138 embedded_worker_id_)); | 136 embedded_worker_id_)); |
139 } | 137 } |
140 | 138 |
141 } // namespace content | 139 } // namespace content |
OLD | NEW |