Backed out changeset 41d45871d805 (bug 1180125)

layout/base/nsPresContext.cpp

@@ -360,7 +360,6 @@ nsPresContext::LastRelease()
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsPresContext)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsPresContext)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAnimationManager);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument);
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mDeviceContext); // not xpcom
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mEventManager);
@@ -373,7 +372,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsPresContext)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsPresContext)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mAnimationManager);
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument);
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDeviceContext); // worth bothering?
   // NS_RELEASE(tmp->mLanguage); // an atom

layout/style/AnimationCommon.cpp

@@ -185,6 +185,12 @@ CommonAnimationManager::GetAnimationsForCompositor(const nsIFrame* aFrame,
   return collection;
 }
 
+/*
+ * nsISupports implementation
+ */
+
+NS_IMPL_ISUPPORTS(CommonAnimationManager, nsIStyleRuleProcessor)
+
 nsRestyleHint
 CommonAnimationManager::HasStateDependentStyle(StateRuleProcessorData* aData)
 {

layout/style/AnimationCommon.h

@@ -44,6 +44,9 @@ class CommonAnimationManager : public nsIStyleRuleProcessor,
 public:
   explicit CommonAnimationManager(nsPresContext *aPresContext);
 
+  // nsISupports
+  NS_DECL_ISUPPORTS
+
   // nsIStyleRuleProcessor (parts)
   virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData) override;
   virtual nsRestyleHint HasStateDependentStyle(PseudoElementStateRuleProcessorData* aData) override;

layout/style/nsAnimationManager.cpp

@@ -31,8 +31,6 @@ using mozilla::dom::AnimationPlayState;
 using mozilla::dom::KeyframeEffectReadOnly;
 using mozilla::dom::CSSAnimation;
 
-////////////////////////// CSSAnimation ////////////////////////////
-
 JSObject*
 CSSAnimation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 {
@@ -303,26 +301,6 @@ CSSAnimation::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
   }
 }
 
-////////////////////////// nsAnimationManager ////////////////////////////
-
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsAnimationManager)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsAnimationManager)
-  tmp->mPendingEvents.Clear();
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsAnimationManager)
-  for (AnimationEventInfo& info : tmp->mPendingEvents) {
-    ImplCycleCollectionTraverse(cb, info.mElement, "mPendingEvents.mElement");
-  }
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsAnimationManager)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsAnimationManager)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsAnimationManager)
-  NS_INTERFACE_MAP_ENTRY(nsIStyleRuleProcessor)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRuleProcessor)
-NS_INTERFACE_MAP_END
-
 void
 nsAnimationManager::MaybeUpdateCascadeResults(AnimationCollection* aCollection)
 {

layout/style/nsAnimationManager.h

@@ -248,9 +248,6 @@ public:
   {
   }
 
-  NS_DECL_CYCLE_COLLECTION_CLASS(nsAnimationManager)
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-
   void MaybeUpdateCascadeResults(mozilla::AnimationCollection* aCollection);
 
   // nsIStyleRuleProcessor (parts)

layout/style/nsTransitionManager.cpp

@@ -74,7 +74,9 @@ ElementPropertyTransition::CurrentValuePortion() const
          .GetValue(computedTiming.mProgress);
 }
 
-////////////////////////// CSSTransition ////////////////////////////
+/*****************************************************************************
+ * CSSTransition                                                             *
+ *****************************************************************************/
 
 JSObject*
 CSSTransition::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
@@ -174,9 +176,9 @@ CSSTransition::HasLowerCompositeOrderThan(const Animation& aOther) const
          nsCSSProps::GetStringValue(otherTransition->TransitionProperty());
 }
 
-////////////////////////// nsTransitionManager ////////////////////////////
-
-NS_IMPL_ISUPPORTS(nsTransitionManager, nsIStyleRuleProcessor)
+/*****************************************************************************
+ * nsTransitionManager                                                       *
+ *****************************************************************************/
 
 void
 nsTransitionManager::StyleContextChanged(dom::Element *aElement,

layout/style/nsTransitionManager.h

@@ -182,8 +182,6 @@ public:
   {
   }
 
-  NS_DECL_ISUPPORTS
-
   typedef mozilla::AnimationCollection AnimationCollection;
 
   /**