Chromium Code Reviews| 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/indexed_db_message_filter.h" | |
| 17 #include "content/common/quota_dispatcher.h" | 18 #include "content/common/quota_dispatcher.h" |
| 18 #include "content/common/resource_dispatcher.h" | 19 #include "content/common/resource_dispatcher.h" |
| 19 #include "content/common/socket_stream_dispatcher.h" | 20 #include "content/common/socket_stream_dispatcher.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 |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 53 | 54 |
| 54 resource_dispatcher_.reset(new ResourceDispatcher(this)); | 55 resource_dispatcher_.reset(new ResourceDispatcher(this)); |
| 55 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); | 56 socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); |
| 56 file_system_dispatcher_.reset(new FileSystemDispatcher()); | 57 file_system_dispatcher_.reset(new FileSystemDispatcher()); |
| 57 quota_dispatcher_.reset(new QuotaDispatcher()); | 58 quota_dispatcher_.reset(new QuotaDispatcher()); |
| 58 | 59 |
| 59 sync_message_filter_ = | 60 sync_message_filter_ = |
| 60 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); | 61 new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent()); |
| 61 channel_->AddFilter(sync_message_filter_.get()); | 62 channel_->AddFilter(sync_message_filter_.get()); |
| 62 channel_->AddFilter(new ChildTraceMessageFilter()); | 63 channel_->AddFilter(new ChildTraceMessageFilter()); |
| 64 | |
| 65 idb_message_filter_ = new IndexedDBMessageFilter; | |
| 66 channel_->AddFilter(idb_message_filter_.get()); | |
|
michaeln
2011/12/14 02:15:53
The data member isn't used, would it work to just
dgrogan
2011/12/15 02:47:44
Yes, this works, it causes the ipc channel to be t
| |
| 63 } | 67 } |
| 64 | 68 |
| 65 ChildThread::~ChildThread() { | 69 ChildThread::~ChildThread() { |
| 66 #ifdef IPC_MESSAGE_LOG_ENABLED | 70 #ifdef IPC_MESSAGE_LOG_ENABLED |
| 67 IPC::Logging::GetInstance()->SetIPCSender(NULL); | 71 IPC::Logging::GetInstance()->SetIPCSender(NULL); |
| 68 #endif | 72 #endif |
| 69 | 73 |
| 70 channel_->RemoveFilter(sync_message_filter_.get()); | 74 channel_->RemoveFilter(sync_message_filter_.get()); |
| 71 | 75 |
| 72 // Close this channel before resetting the message loop attached to it so | 76 // Close this channel before resetting the message loop attached to it so |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 263 MessageLoop::current()->Quit(); | 267 MessageLoop::current()->Quit(); |
| 264 return; | 268 return; |
| 265 } | 269 } |
| 266 | 270 |
| 267 // The child process shutdown sequence is a request response based mechanism, | 271 // 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 | 272 // 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. | 273 // 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. | 274 // The browser then sends back a response if it's ok to shutdown. |
| 271 Send(new ChildProcessHostMsg_ShutdownRequest); | 275 Send(new ChildProcessHostMsg_ShutdownRequest); |
| 272 } | 276 } |
| OLD | NEW |