OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/common/child_thread.h" | 5 #include "content/common/child_thread.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/process.h" | 9 #include "base/process.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/tracked_objects.h" | 12 #include "base/tracked_objects.h" |
13 #include "content/common/child_process.h" | 13 #include "content/common/child_process.h" |
14 #include "content/common/child_process_messages.h" | 14 #include "content/common/child_process_messages.h" |
15 #include "content/common/child_trace_message_filter.h" | 15 #include "content/common/child_trace_message_filter.h" |
16 #include "content/common/file_system/file_system_dispatcher.h" | 16 #include "content/common/file_system/file_system_dispatcher.h" |
17 #include "content/common/quota_dispatcher.h" | 17 #include "content/common/quota_dispatcher.h" |
18 #include "content/common/resource_dispatcher.h" | 18 #include "content/common/resource_dispatcher.h" |
19 #include "content/common/socket_stream_dispatcher.h" | 19 #include "content/common/socket_stream_dispatcher.h" |
| 20 #include "content/common/worker_task_runner.h" |
20 #include "content/public/common/content_switches.h" | 21 #include "content/public/common/content_switches.h" |
21 #include "ipc/ipc_logging.h" | 22 #include "ipc/ipc_logging.h" |
22 #include "ipc/ipc_sync_channel.h" | 23 #include "ipc/ipc_sync_channel.h" |
23 #include "ipc/ipc_sync_message_filter.h" | 24 #include "ipc/ipc_sync_message_filter.h" |
24 #include "ipc/ipc_switches.h" | 25 #include "ipc/ipc_switches.h" |
25 #include "webkit/glue/webkit_glue.h" | 26 #include "webkit/glue/webkit_glue.h" |
26 | 27 |
27 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
28 #include "content/common/handle_enumerator_win.h" | 29 #include "content/common/handle_enumerator_win.h" |
29 #endif | 30 #endif |
30 | 31 |
| 32 base::LazyInstance<WorkerTaskRunner, |
| 33 base::LeakyLazyInstanceTraits<WorkerTaskRunner> > |
| 34 ChildThread::worker_task_runner_= LAZY_INSTANCE_INITIALIZER; |
| 35 |
31 ChildThread::ChildThread() { | 36 ChildThread::ChildThread() { |
32 channel_name_ = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 37 channel_name_ = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
33 switches::kProcessChannelID); | 38 switches::kProcessChannelID); |
34 Init(); | 39 Init(); |
35 } | 40 } |
36 | 41 |
37 ChildThread::ChildThread(const std::string& channel_name) | 42 ChildThread::ChildThread(const std::string& channel_name) |
38 : channel_name_(channel_name) { | 43 : channel_name_(channel_name) { |
39 Init(); | 44 Init(); |
40 } | 45 } |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 MessageLoop::current()->Quit(); | 268 MessageLoop::current()->Quit(); |
264 return; | 269 return; |
265 } | 270 } |
266 | 271 |
267 // The child process shutdown sequence is a request response based mechanism, | 272 // The child process shutdown sequence is a request response based mechanism, |
268 // where we send out an initial feeler request to the child process host | 273 // where we send out an initial feeler request to the child process host |
269 // instance in the browser to verify if it's ok to shutdown the child process. | 274 // instance in the browser to verify if it's ok to shutdown the child process. |
270 // The browser then sends back a response if it's ok to shutdown. | 275 // The browser then sends back a response if it's ok to shutdown. |
271 Send(new ChildProcessHostMsg_ShutdownRequest); | 276 Send(new ChildProcessHostMsg_ShutdownRequest); |
272 } | 277 } |
| 278 |
| 279 WorkerTaskRunner* ChildThread::worker_task_runner() const { |
| 280 return worker_task_runner_.Pointer(); |
| 281 } |
OLD | NEW |