Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1187144 (part 3) - Replace nsBaseHashtable::Enumerate() calls in layout/ with iterators. r=dholbert.

Browse Source 
--HG--
extra : rebase_source : 97ae87fa81658dc436cfb1921e6c0020122490f9
This commit is contained in:
Nicholas Nethercote 2015-11-22 21:08:23 -08:00
parent c6fc31d161
commit dfdac49b21
1 changed files with 46 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
layout/style/CounterStyleManager.cpp
View File

@ -2045,74 +2045,54 @@ CounterStyleManager::GetBuiltinStyle(int32_t aStyle)
return &gBuiltinStyleTable[aStyle];
}
struct InvalidateOldStyleData
{
explicit InvalidateOldStyleData(nsPresContext* aPresContext)
: mPresContext(aPresContext),
mChanged(false)
{
}
nsPresContext* mPresContext;
nsTArray<RefPtr<CounterStyle>> mToBeRemoved;
bool mChanged;
};
static PLDHashOperator
InvalidateOldStyle(const nsSubstring& aKey,
RefPtr<CounterStyle>& aStyle,
void* aArg)
{
InvalidateOldStyleData* data = static_cast<InvalidateOldStyleData*>(aArg);
bool toBeUpdated = false;
bool toBeRemoved = false;
nsCSSCounterStyleRule* newRule = data->mPresContext->
StyleSet()->CounterStyleRuleForName(aKey);
if (!newRule) {
if (aStyle->IsCustomStyle()) {
toBeRemoved = true;
}
} else {
if (!aStyle->IsCustomStyle()) {
toBeRemoved = true;
} else {
CustomCounterStyle* style =
static_cast<CustomCounterStyle*>(aStyle.get());
if (style->GetRule() != newRule) {
toBeRemoved = true;
} else if (style->GetRuleGeneration() != newRule->GetGeneration()) {
toBeUpdated = true;
style->ResetCachedData();
}
}
}
data->mChanged = data->mChanged || toBeUpdated || toBeRemoved;
if (toBeRemoved) {
if (aStyle->IsDependentStyle()) {
if (aStyle->IsCustomStyle()) {
// Since |aStyle| is being removed from mCacheTable, it won't be visited
// by our post-removal iteration. So, we have to give it a manual
// ResetDependentData() call. (This only really matters if something
// else is holding a reference and keeping it alive.)
static_cast<CustomCounterStyle*>(aStyle.get())->ResetDependentData();
}
// The object has to be held here so that it will not be released
// before all pointers that refer to it are reset. It will be
// released when the MarkAndCleanData goes out of scope at the end
// of NotifyRuleChanged().
data->mToBeRemoved.AppendElement(aStyle);
}
return PL_DHASH_REMOVE;
}
return PL_DHASH_NEXT;
}
bool
CounterStyleManager::NotifyRuleChanged()
{
InvalidateOldStyleData data(mPresContext);
mCacheTable.Enumerate(InvalidateOldStyle, &data);
if (data.mChanged) {
bool changed = false;
nsTArray<RefPtr<CounterStyle>> kungFuDeathGrip;
for (auto iter = mCacheTable.Iter(); !iter.Done(); iter.Next()) {
RefPtr<CounterStyle>& style = iter.Data();
bool toBeUpdated = false;
bool toBeRemoved = false;
nsCSSCounterStyleRule* newRule =
mPresContext->StyleSet()->CounterStyleRuleForName(iter.Key());
if (!newRule) {
if (style->IsCustomStyle()) {
toBeRemoved = true;
}
} else {
if (!style->IsCustomStyle()) {
toBeRemoved = true;
} else {
auto custom = static_cast<CustomCounterStyle*>(style.get());
if (custom->GetRule() != newRule) {
toBeRemoved = true;
} else if (custom->GetRuleGeneration() != newRule->GetGeneration()) {
toBeUpdated = true;
custom->ResetCachedData();
}
}
}
changed = changed || toBeUpdated || toBeRemoved;
if (toBeRemoved) {
if (style->IsDependentStyle()) {
if (style->IsCustomStyle()) {
// Since |style| is being removed from mCacheTable, it won't be
// visited by our post-removal iteration. So, we have to give it a
// manual ResetDependentData() call. (This only really matters if
// something else is holding a reference and keeping it alive.)
static_cast<CustomCounterStyle*>(style.get())->ResetDependentData();
}
// The object has to be held here so that it will not be released
// before all pointers that refer to it are reset. It will be released
// when kungFuDeathGrip goes out of scope at the end of this function.
kungFuDeathGrip.AppendElement(style);
}
iter.Remove();
}
}
if (changed) {
for (auto iter = mCacheTable.Iter(); !iter.Done(); iter.Next()) {
CounterStyle* style = iter.UserData();
if (style->IsCustomStyle()) {
@ -2123,7 +2103,7 @@ CounterStyleManager::NotifyRuleChanged()
// instances, so we don't need to reset their data.
}
}
return data.mChanged;
return changed;
}
} // namespace mozilla