Bug 568691 - Move cycle collection earlier: XPConnect is initialized during component manager initialization and tries to register a CC language helper.

This commit is contained in:
Benjamin Smedberg 2010-06-22 12:59:57 -04:00
Родитель a73308ef4b
Коммит 95c31020b0
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -489,6 +489,9 @@ NS_InitXPCOM2(nsIServiceManager* *result,
nsComponentManagerImpl::gComponentManager = new nsComponentManagerImpl();
NS_ADDREF(nsComponentManagerImpl::gComponentManager);
rv = nsCycleCollector_startup();
if (NS_FAILED(rv)) return rv;
rv = nsComponentManagerImpl::gComponentManager->Init();
if (NS_FAILED(rv))
{
@ -502,9 +505,6 @@ NS_InitXPCOM2(nsIServiceManager* *result,
NS_TIME_FUNCTION_MARK("Next: cycle collector startup");
rv = nsCycleCollector_startup();
if (NS_FAILED(rv)) return rv;
NS_TIME_FUNCTION_MARK("Next: interface info manager init");
// The iimanager constructor searches and registers XPT files.