wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 416886 - Find module loaders which are part of the static component list early, and process components which end up in the leftovers list in forwards instead of reverse order. This means that JS component in extensions can correctly override JS components in the core app. r=dougt a=schrep

Browse Source
This commit is contained in:
benjamin@smedbergs.us 2008-02-21 08:23:06 -08:00
parent 302888f80f
commit 2ad1146e0e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpcom/components/nsComponentManager.cpp
View File

@ -2983,11 +2983,15 @@ nsComponentManagerImpl::LoadLeftoverComponents(
LoaderType curLoader = GetLoaderCount();
for (PRInt32 i = aLeftovers.Count() - 1; i >= 0; --i) {
for (PRInt32 i = 0; i < aLeftovers.Count(); ) {
nsresult rv = AutoRegisterComponent(aLeftovers[i], aDeferred,
minLoader);
if (NS_SUCCEEDED(rv))
if (NS_SUCCEEDED(rv)) {
aLeftovers.RemoveObjectAt(i);
}
else {
++i;
}
}
if (aLeftovers.Count())
// recursively try this again until there are no new loaders found
@ -3179,10 +3183,16 @@ nsComponentManagerImpl::AutoRegister(nsIFile *aSpec)
nsCOMArray<nsILocalFile> leftovers;
nsTArray<DeferredModule> deferred;
if (!aSpec)
if (!aSpec) {
mStaticModuleLoader.EnumerateModules(RegisterStaticModule,
deferred);
// Builtin component loaders (xpconnect!) can be static modules.
// Set them up now, so that JS components don't go into
// the leftovers list.
GetAllLoaders();
}
LoaderType curLoader = GetLoaderCount();
if (aSpec) {