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 408135: Get rid of unnecessary array churning in nsCSSRuleProcessor::GetRuleCascade. r/sr=dbaron

Browse Source
This commit is contained in:
jonas@sicking.cc 2007-12-13 16:24:39 -08:00
parent 5c3a6df55f
commit 2c8a4bad88
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
layout/style/nsCSSRuleProcessor.cpp
View File

@ -2094,26 +2094,6 @@ FillArray(nsHashKey* aKey, void* aData, void* aClosure)
return PR_TRUE;
}
/**
* Takes the hashtable of arrays (keyed by weight, in order sort) and
* puts them all in one big array which has a primary sort by weight
* and secondary sort by order.
*/
static void PutRulesInList(nsObjectHashtable* aRuleArrays,
nsVoidArray* aWeightedRules)
{
PRInt32 arrayCount = aRuleArrays->Count();
RuleArrayData* arrayData = new RuleArrayData[arrayCount];
FillArrayData faData(arrayData);
aRuleArrays->Enumerate(FillArray, &faData);
NS_QuickSort(arrayData, arrayCount, sizeof(RuleArrayData),
CompareArrayData, nsnull);
for (PRInt32 i = 0; i < arrayCount; ++i)
aWeightedRules->AppendElements(*arrayData[i].mRuleArray);
delete [] arrayData;
}
RuleCascadeData*
nsCSSRuleProcessor::GetRuleCascade(nsPresContext* aPresContext)
{
@ -2133,22 +2113,33 @@ nsCSSRuleProcessor::GetRuleCascade(nsPresContext* aPresContext)
}
if (mSheets.Count() != 0) {
cascade = new RuleCascadeData(medium,
eCompatibility_NavQuirks == aPresContext->CompatibilityMode());
if (cascade) {
CascadeEnumData data(aPresContext, cascade->mRuleHash.Arena());
nsAutoPtr<RuleCascadeData> newCascade(
new RuleCascadeData(medium,
eCompatibility_NavQuirks == aPresContext->CompatibilityMode()));
if (newCascade) {
CascadeEnumData data(aPresContext, newCascade->mRuleHash.Arena());
mSheets.EnumerateForwards(CascadeSheetRulesInto, &data);
nsVoidArray weightedRules;
PutRulesInList(&data.mRuleArrays, &weightedRules);
// Take the hashtable of arrays (keyed by weight, in order sort) and
// sort by weight and secondary sort by order.
PRInt32 arrayCount = data.mRuleArrays.Count();
nsAutoArrayPtr<RuleArrayData> arrayData(new RuleArrayData[arrayCount]);
FillArrayData faData(arrayData);
data.mRuleArrays.Enumerate(FillArray, &faData);
NS_QuickSort(arrayData, arrayCount, sizeof(RuleArrayData),
CompareArrayData, nsnull);
// Put things into the rule hash backwards because it's easier to
// build a singly linked list lowest-first that way.
if (!weightedRules.EnumerateBackwards(AddRule, cascade)) {
delete cascade;
cascade = nsnull;
for (PRInt32 i = arrayCount - 1; i >= 0; --i) {
if (!arrayData[i].mRuleArray->EnumerateBackwards(AddRule,
newCascade)) {
return nsnull;
}
}
*cascadep = cascade;
*cascadep = newCascade;
cascade = newCascade.forget();
}
}
return cascade;