From 82ec6020a136c3cd681cbc51234719e09585f9c2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 17 Feb 2015 11:15:05 +1300
Subject: [PATCH] Bug 960465 patch 19 - Remove users of
 eRestyle_ChangeAnimationPhase.  r=birtles

---
 dom/base/Element.cpp                 | 3 +--
 layout/style/AnimationCommon.h       | 1 -
 layout/style/nsHTMLCSSStyleSheet.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 120ce72cdc10..1e88be2e5c40 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -1803,8 +1803,7 @@ Element::SetSMILOverrideStyleRule(css::StyleRule* aStyleRule,
     if (doc) {
       nsCOMPtr<nsIPresShell> shell = doc->GetShell();
       if (shell) {
-        shell->RestyleForAnimation(this,
-          eRestyle_StyleAttribute | eRestyle_ChangeAnimationPhase);
+        shell->RestyleForAnimation(this, eRestyle_StyleAttribute);
       }
     }
   }
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index 03390ecabd7d..04ad10f5ee88 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -331,7 +331,6 @@ struct AnimationPlayerCollection : public PRCList
     if (element) {
       nsRestyleHint hint = IsForTransitions() ? eRestyle_CSSTransitions
                                               : eRestyle_CSSAnimations;
-      hint |= eRestyle_ChangeAnimationPhase;
       aPresContext->PresShell()->RestyleForAnimation(element, hint);
     }
   }
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index 7ee12e27e16e..a410f9458aa1 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -138,7 +138,7 @@ nsHTMLCSSStyleSheet::HasAttributeDependentStyle(AttributeRuleProcessorData* aDat
   // Perhaps should check that it's XUL, SVG, (or HTML) namespace, but
   // it doesn't really matter.
   if (aData->mAttrHasChanged && aData->mAttribute == nsGkAtoms::style) {
-    return eRestyle_StyleAttribute | eRestyle_ChangeAnimationPhase;
+    return eRestyle_StyleAttribute;
   }
 
   return nsRestyleHint(0);