Bug 993918 - Shut down CAPS and XPConnect after imagelib and gfx. r=Ms2ger
authorBobby Holley <bobbyholley@gmail.com>
Sun, 13 Apr 2014 10:15:29 -0700
changeset 196777 2f78b61616489359d4d41756035c105ca4a048aa
parent 196776 b43f62c11005a5a8b13327ba2101c82db0a4160a
child 196778 4a2232514c15c0296a82757aa1bf69a5847dfbcf
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
bugs993918
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 993918 - Shut down CAPS and XPConnect after imagelib and gfx. r=Ms2ger
layout/build/nsLayoutModule.cpp
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -1245,23 +1245,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,