Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc (revision 150367) |
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc (working copy) |
@@ -402,9 +402,11 @@ |
// destroy it. We want to do this prior to calling DidDestroy in case the |
// destructor of the instance object tries to use the instance. |
message_channel_->SetPassthroughObject(NULL); |
- instance_interface_->DidDestroy(pp_instance()); |
+ // If this is a NaCl plugin instance, allow the trusted NaCl plugin to start |
+ // its own shutdown before the untrusted plugin, which may hang. |
if (nacl_plugin_instance_interface_.get()) |
nacl_plugin_instance_interface_->DidDestroy(pp_instance()); |
dmichael (off chromium)
2012/08/08 22:28:52
This *should* kill the sel_ldr process where the n
|
+ instance_interface_->DidDestroy(pp_instance()); |
bbudge
2012/08/08 20:31:57
If this hangs, is there an issue about the code th
dmichael (off chromium)
2012/08/08 22:28:52
Hmm, it *is* a synchronous message. But if the pro
|
if (fullscreen_container_) { |
fullscreen_container_->Destroy(); |