Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 18:50:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jsdom.dll doesn't like the reordering of registrations. Revering the order of registrations back to what it was except for letting nsIFileLocator go before autoregistraion, since it depends on IFileLocator.

Browse Source
This commit is contained in:
dp%netscape.com 1999-05-06 23:09:57 +00:00
parent 820e45d15e
commit c4cb788cb1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpfe/bootstrap/nsSetupRegistry.cpp
View File

@ -124,6 +124,17 @@ nsresult NS_AutoregisterComponents()
extern "C" void
NS_SetupRegistry_1()
{
nsComponentManager::RegisterComponent(kFileLocatorCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
// This *has* to happen after registration of nsIFileLocator as the call
// required it.
//
// The right thing for autoregistration which causes dynamic component
// registraion is to happen after all the static RegisterComponents()
// have been registered. But doing that is causing a coredump with
// jsdom.dll. Puttin that off until that gets resolved.
NS_AutoregisterComponents();
/*
* Call the standard NS_SetupRegistry() implemented in
* webshell/tests/viewer/nsSetupregistry.cpp
@ -132,7 +143,6 @@ NS_SetupRegistry_1()
nsComponentManager::RegisterComponent(kCAppShellServiceCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kCCmdLineServiceCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kFileLocatorCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kXPConnectFactoryCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kGlobalHistoryCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kNetSupportDialogCID, NULL, NULL, APPSHELL_DLL, PR_TRUE, PR_TRUE);
@ -151,11 +161,6 @@ NS_SetupRegistry_1()
//All Editor registration is done in webshell/tests/viewer/nsSetupregistry.cpp
// After we have Registered all the app specific components, install all the dynamic
// components. This has to happen after all the above registrations as nsIFileLocator
// is required in looking for files.
NS_AutoregisterComponents();
}