| Index: content/common/child_process_host_impl.cc
|
| diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
|
| index 909a3d6ee256f974a39ac1416e44acd43c121698..b7b6c0a775a75ba3b88dfd717fb9c3767a2d99b7 100644
|
| --- a/content/common/child_process_host_impl.cc
|
| +++ b/content/common/child_process_host_impl.cc
|
| @@ -85,7 +85,8 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
|
|
|
| ChildProcessHostImpl::ChildProcessHostImpl(ChildProcessHostDelegate* delegate)
|
| : delegate_(delegate),
|
| - opening_channel_(false) {
|
| + opening_channel_(false),
|
| + is_shutting_down_(false) {
|
| #if defined(OS_WIN)
|
| AddFilter(new FontCacheDispatcher());
|
| #endif
|
| @@ -130,6 +131,11 @@ void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
|
|
|
| void ChildProcessHostImpl::ForceShutdown() {
|
| Send(new ChildProcessMsg_Shutdown());
|
| + is_shutting_down_ = true;
|
| +}
|
| +
|
| +bool ChildProcessHostImpl::IsShuttingDown() {
|
| + return is_shutting_down_;
|
| }
|
|
|
| std::string ChildProcessHostImpl::CreateChannelMojo(
|
| @@ -330,8 +336,10 @@ void ChildProcessHostImpl::OnAllocateSharedMemory(
|
| }
|
|
|
| void ChildProcessHostImpl::OnShutdownRequest() {
|
| - if (delegate_->CanShutdown())
|
| + if (delegate_->CanShutdown()) {
|
| Send(new ChildProcessMsg_Shutdown());
|
| + is_shutting_down_ = true;
|
| + }
|
| }
|
|
|
| void ChildProcessHostImpl::OnAllocateGpuMemoryBuffer(
|
|
|