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 266127 11000e0b0c71
parent 266126 01c9c80931d5
child 266128 cc237f8e9fa5
push id4762
push userryanvm@gmail.com
push date2015-05-28 18:54 +0000
treeherdermozilla-beta@dc9c305024f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, ritu
bugs1164264
milestone39.0
Bug 1164264 - [EME] If there are no plugins left, don't wait for anything to shutdown. r=cpearce, a=ritu
dom/media/gmp/GMPService.cpp
--- a/dom/media/gmp/GMPService.cpp
+++ b/dom/media/gmp/GMPService.cpp
@@ -375,16 +375,17 @@ GeckoMediaPluginService::Observe(nsISupp
     }
 
     if (gmpThread) {
       gmpThread->Dispatch(
         NS_NewRunnableMethod(this, &GeckoMediaPluginService::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)) {