Bug 1285407 - Part 3: Remove UpdateCascadeResults call because it's called against the same nsStyleContext from MaybeUpdateAnimationRule. r?birtles draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Mon, 11 Jul 2016 17:28:17 +0900
changeset 386115 0ee0933779dd6089853b4a430c5db269a9d749ea
parent 386114 8c9daee7dbf9474d7e1940fa9a35491e2d8ad99f
child 386116 fe1e8e81f012f9bbdf9dc7a38136ddfae1eedcf2
push id22626
push userhiikezoe@mozilla-japan.org
push dateMon, 11 Jul 2016 08:29:02 +0000
reviewersbirtles
bugs1285407
milestone50.0a1
Bug 1285407 - Part 3: Remove UpdateCascadeResults call because it's called against the same nsStyleContext from MaybeUpdateAnimationRule. r?birtles MozReview-Commit-ID: FrrFLq9S2f4
layout/style/nsAnimationManager.cpp
layout/style/nsTransitionManager.cpp
--- 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.