Bug 805971 - Don't create and discard StartupCache instances on not-main processes r=mwu

This commit is contained in:
Tim Taubert 2012-10-27 00:27:53 +02:00
parent d39e8fbbb6
commit 1d9d6931ab

View File

@ -88,8 +88,14 @@ static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
StartupCache*
StartupCache::GetSingleton()
{
if (!gStartupCache)
if (!gStartupCache) {
if (XRE_GetProcessType() != GeckoProcessType_Default) {
NS_WARNING("Startup cache is only available in the chrome process");
return nullptr;
}
StartupCache::InitSingleton();
}
return StartupCache::gStartupCache;
}
@ -143,10 +149,6 @@ StartupCache::~StartupCache()
nsresult
StartupCache::Init()
{
if (XRE_GetProcessType() != GeckoProcessType_Default) {
NS_WARNING("Startup cache is only available in the chrome process");
return NS_ERROR_NOT_AVAILABLE;
}
// workaround for bug 653936
nsCOMPtr<nsIProtocolHandler> jarInitializer(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "jar"));