Bug 993918 - Shut down CAPS and XPConnect after imagelib and gfx. r=Ms2ger

This commit is contained in:
Bobby Holley 2014-04-13 10:15:29 -07:00
parent 88fea0ed9f
commit beaeb53a80

View File

@ -1250,13 +1250,14 @@ LayoutModuleDtor()
{ {
Shutdown(); Shutdown();
nsContentUtils::XPCOMShutdown(); nsContentUtils::XPCOMShutdown();
nsScriptSecurityManager::Shutdown();
xpcModuleDtor();
// Layout depends heavily on gfx and imagelib, so we want to make sure that // 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. // these modules are shut down after all the layout cleanup runs.
mozilla::image::ShutdownModule(); mozilla::image::ShutdownModule();
gfxPlatform::Shutdown(); gfxPlatform::Shutdown();
nsScriptSecurityManager::Shutdown();
xpcModuleDtor();
} }
static const mozilla::Module kLayoutModule = { static const mozilla::Module kLayoutModule = {