| 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/worker/webworkerclient_proxy.h" | 5 #include "content/worker/webworkerclient_proxy.h" |
| 6 | 6 |
| 7 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 8 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 9 #include "content/common/file_system/file_system_dispatcher.h" | 10 #include "content/common/file_system/file_system_dispatcher.h" |
| 10 #include "content/common/file_system/webfilesystem_callback_dispatcher.h" | 11 #include "content/common/file_system/webfilesystem_callback_dispatcher.h" |
| 11 #include "content/common/webmessageportchannel_impl.h" | 12 #include "content/common/webmessageportchannel_impl.h" |
| 12 #include "content/common/worker_messages.h" | 13 #include "content/common/worker_messages.h" |
| 13 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
| 14 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the | 15 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the |
| 15 // renderer worker code moves to content. This code isn't used now since we | 16 // renderer worker code moves to content. This code isn't used now since we |
| 16 // don't support nested workers anyways. | 17 // don't support nested workers anyways. |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 // renderer process. | 203 // renderer process. |
| 203 NOTIMPLEMENTED(); | 204 NOTIMPLEMENTED(); |
| 204 return; | 205 return; |
| 205 } | 206 } |
| 206 | 207 |
| 207 // This shuts down the process cleanly from the perspective of the browser | 208 // This shuts down the process cleanly from the perspective of the browser |
| 208 // process, and avoids the crashed worker infobar from appearing to the new | 209 // process, and avoids the crashed worker infobar from appearing to the new |
| 209 // page. It's ok to post several of theese, because the first executed task | 210 // page. It's ok to post several of theese, because the first executed task |
| 210 // will exit the message loop and subsequent ones won't be executed. | 211 // will exit the message loop and subsequent ones won't be executed. |
| 211 MessageLoop::current()->PostDelayedTask(FROM_HERE, | 212 MessageLoop::current()->PostDelayedTask(FROM_HERE, |
| 212 kill_process_factory_.NewRunnableMethod( | 213 base::Bind( |
| 213 &WebWorkerClientProxy::workerContextDestroyed), | 214 &WebWorkerClientProxy::workerContextDestroyed, |
| 214 kMaxTimeForRunawayWorkerMs); | 215 kill_process_factory_.GetWeakPtr()), |
| 216 kMaxTimeForRunawayWorkerMs); |
| 215 } | 217 } |
| OLD | NEW |