Bug 993918 - Shut down CAPS and XPConnect after imagelib and gfx. r=Ms2ger,bsmedberg, a=sylvestre
authorBobby Holley <bobbyholley@gmail.com>
Mon, 14 Apr 2014 09:21:09 -0700
changeset 183751 afc5f648e247f8f5ded9f1981b12c72681f0869c
parent 183750 a7433dd3312aba534398b413b099965de95c4978
child 183752 f11f4dda1cdeeb6609e0e8f066e3f06b3bd93609
push id3469
push userbobbyholley@gmail.com
push dateMon, 14 Apr 2014 16:21:24 +0000
treeherdermozilla-beta@afc5f648e247 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger, bsmedberg, sylvestre
bugs993918
milestone29.0
Bug 993918 - Shut down CAPS and XPConnect after imagelib and gfx. r=Ms2ger,bsmedberg, a=sylvestre
layout/build/nsLayoutModule.cpp
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -1249,23 +1249,24 @@ static const mozilla::Module::CategoryEn
   { nullptr }
 };
 
 static void
 LayoutModuleDtor()
 {
   Shutdown();
   nsContentUtils::XPCOMShutdown();
-  nsScriptSecurityManager::Shutdown();
-  xpcModuleDtor();
 
   // Layout depends heavily on gfx and imagelib, so we want to make sure that
   // these modules are shut down after all the layout cleanup runs.
   mozilla::image::ShutdownModule();
   gfxPlatform::Shutdown();
+
+  nsScriptSecurityManager::Shutdown();
+  xpcModuleDtor();
 }
 
 static const mozilla::Module kLayoutModule = {
   mozilla::Module::kVersion,
   kLayoutCIDs,
   kLayoutContracts,
   kLayoutCategories,
   nullptr,