Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 10824220: Fix NaCl plugin shutdown when running the Chrome PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698