Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 823124; speculative fix - null style rule from an animation; r=dbaron

Browse Source
This commit is contained in:
Nicholas Cameron 2012-12-27 11:42:34 +13:00
parent 58405dbcaf
commit cf3f70bb6a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/style/nsTransitionManager.cpp
View File

@ -270,10 +270,10 @@ nsTransitionManager::UpdateThrottledStyle(dom::Element* aElement,
break;
}
nsStyleSet::RuleAndLevel* curRule = rules.AppendElement();
curRule->mLevel = ruleNode->GetLevel();
nsStyleSet::RuleAndLevel curRule;
curRule.mLevel = ruleNode->GetLevel();
if (curRule->mLevel == nsStyleSet::eAnimationSheet) {
if (curRule.mLevel == nsStyleSet::eAnimationSheet) {
ElementAnimations* ea =
mPresContext->AnimationManager()->GetElementAnimations(aElement,
oldStyle->GetPseudoType(),
@ -281,20 +281,24 @@ nsTransitionManager::UpdateThrottledStyle(dom::Element* aElement,
NS_ASSERTION(ea, "Rule has level eAnimationSheet without animation on manager");
mPresContext->AnimationManager()->EnsureStyleRuleFor(ea);
curRule->mRule = ea->mStyleRule;
curRule.mRule = ea->mStyleRule;
ForceLayerRerendering(primaryFrame, ea);
} else if (curRule->mLevel == nsStyleSet::eTransitionSheet) {
} else if (curRule.mLevel == nsStyleSet::eTransitionSheet) {
ElementTransitions *et =
GetElementTransitions(aElement, oldStyle->GetPseudoType(), false);
NS_ASSERTION(et, "Rule has level eTransitionSheet without transition on manager");
et->EnsureStyleRuleFor(mPresContext->RefreshDriver()->MostRecentRefresh());
curRule->mRule = et->mStyleRule;
curRule.mRule = et->mStyleRule;
ForceLayerRerendering(primaryFrame, et);
} else {
curRule->mRule = ruleNode->GetRule();
curRule.mRule = ruleNode->GetRule();
}
if (curRule.mRule) {
rules.AppendElement(curRule);
}
} while ((ruleNode = ruleNode->GetParent()));
@ -329,7 +333,6 @@ nsTransitionManager::UpdateThrottledStylesForSubtree(nsIContent* aContent,
newStyle = UpdateThrottledStyle(element, aParentStyle);
// remove the current transition from the working set
et->mFlushGeneration = mPresContext->RefreshDriver()->MostRecentRefresh();
;
} else {
// reparent the element's style
nsStyleSet* styleSet = mPresContext->PresShell()->StyleSet();