Bug 1288618 - Part 7: Initialize AbstractThread in the GPU process. r…

…=dvander
iaxat · Sep 21, 2016 · a5adb22 · a5adb22
1 parent 2087e85
commit a5adb22
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
@@ -692,6 +692,9 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
     NS_RUNTIMEABORT(jsInitFailureReason);
   }
   sInitializedJS = true;
+
+  // Init AbstractThread.
+  AbstractThread::InitStatics();
 
   rv = nsComponentManagerImpl::gComponentManager->Init();
   if (NS_FAILED(rv)) {
@@ -715,9 +718,6 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
   // Init SharedThreadPool (which needs the service manager).
   SharedThreadPool::InitStatics();
 
-  // Init AbstractThread.
-  AbstractThread::InitStatics();
-
   // Force layout to spin up so that nsContentUtils is available for cx stack
   // munging.
   nsCOMPtr<nsISupports> componentLoader =
@@ -801,6 +801,8 @@ NS_InitMinimalXPCOM()
     return NS_ERROR_UNEXPECTED;
   }
 
+  AbstractThread::InitStatics();
+
   return NS_OK;
 }