Bug 1285407 - Part 3: Remove UpdateCascadeResults call because it's called against the same nsStyleContext from MaybeUpdateAnimationRule. r?birtles
MozReview-Commit-ID: FrrFLq9S2f4
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -435,20 +435,16 @@ nsAnimationManager::UpdateAnimations(nsS
}
collection->mAnimations.SwapElements(newAnimations);
// Cancel removed animations
for (size_t newAnimIdx = newAnimations.Length(); newAnimIdx-- != 0; ) {
newAnimations[newAnimIdx]->CancelFromStyle();
}
- EffectCompositor::UpdateCascadeResults(aElement,
- aStyleContext->GetPseudoType(),
- aStyleContext);
-
mPresContext->EffectCompositor()->
MaybeUpdateAnimationRule(aElement,
aStyleContext->GetPseudoType(),
EffectCompositor::CascadeLevel::Animations,
aStyleContext);
// We don't actually dispatch the pending events now. We'll either
// dispatch them the next time we get a refresh driver notification
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -415,19 +415,16 @@ nsTransitionManager::StyleContextChanged
MOZ_ASSERT(!startedAny || collection,
"must have element transitions if we started any transitions");
EffectCompositor::CascadeLevel cascadeLevel =
EffectCompositor::CascadeLevel::Transitions;
if (collection) {
- EffectCompositor::UpdateCascadeResults(aElement, pseudoType,
- newStyleContext);
-
collection->UpdateCheckGeneration(mPresContext);
mPresContext->EffectCompositor()->MaybeUpdateAnimationRule(aElement,
pseudoType,
cascadeLevel,
newStyleContext);
}
// We want to replace the new style context with the after-change style.