Bug 1164264 - [EME] If there are no plugins left, don't wait for anything to shutdown. r=cpearce, a=ritu
authorGerald Squelart <gsquelart@mozilla.com>
Thu, 21 May 2015 00:16:00 -0400
changeset 273285 ede9e133138634e2adf7e4e052698dd850c23e23
parent 273284 02ed5720a297063895866f8ce3b3bf11acb7b163
child 273286 fea77ea6d6a21cf248b061e9539d41a2cb352ab9
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, ritu
bugs1164264
milestone40.0a2
Bug 1164264 - [EME] If there are no plugins left, don't wait for anything to shutdown. r=cpearce, a=ritu
dom/media/gmp/GMPServiceParent.cpp
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -254,16 +254,17 @@ GeckoMediaPluginServiceParent::Observe(n
 
     if (gmpThread) {
       gmpThread->Dispatch(
         NS_NewRunnableMethod(this,
                              &GeckoMediaPluginServiceParent::UnloadPlugins),
         NS_DISPATCH_NORMAL);
     } else {
       MOZ_ASSERT(mPlugins.IsEmpty());
+      mWaitingForPluginsAsyncShutdown = false;
     }
 
     // Wait for plugins to do async shutdown...
     while (mWaitingForPluginsAsyncShutdown) {
       NS_ProcessNextEvent(NS_GetCurrentThread(), true);
     }
 
   } else if (!strcmp(NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, aTopic)) {