Backed out changeset 587b33b52ee0 (bug 1180125)

layout/style/AnimationCommon.cpp

@@ -718,21 +718,6 @@ AnimationCollection::HasAnimationOfProperty(nsCSSProperty aProperty) const
   return false;
 }
 
-/*static*/ nsString
-AnimationCollection::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
-{
-  switch (aPseudoType) {
-    case nsCSSPseudoElements::ePseudo_before:
-      return NS_LITERAL_STRING("::before");
-    case nsCSSPseudoElements::ePseudo_after:
-      return NS_LITERAL_STRING("::after");
-    default:
-      MOZ_ASSERT(aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement,
-                 "Unexpected pseudo type");
-      return EmptyString();
-  }
-}
-
 mozilla::dom::Element*
 AnimationCollection::GetElementToRestyle() const
 {

layout/style/AnimationCommon.h

@@ -348,6 +348,19 @@ public:
            mElementProperty == nsGkAtoms::animationsOfAfterProperty;
   }
 
+  nsString PseudoElement() const
+  {
+    if (IsForElement()) {
+      return EmptyString();
+    }
+    if (IsForBeforePseudo()) {
+      return NS_LITERAL_STRING("::before");
+    }
+    MOZ_ASSERT(IsForAfterPseudo(),
+               "::before & ::after should be the only pseudo-elements here");
+    return NS_LITERAL_STRING("::after");
+  }
+
   nsCSSPseudoElements::Type PseudoElementType() const
   {
     if (IsForElement()) {
@@ -361,8 +374,6 @@ public:
     return nsCSSPseudoElements::ePseudo_after;
   }
 
-  static nsString PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType);
-
   dom::Element* GetElementToRestyle() const;
 
   void PostRestyleForAnimation(nsPresContext *aPresContext) {

layout/style/nsAnimationManager.cpp

@@ -252,7 +252,7 @@ CSSAnimation::QueueEvents()
                computedTiming.mActiveDuration);
     manager->QueueEvent(
       AnimationEventInfo(owningElement, mAnimationName, NS_ANIMATION_START,
-                         elapsedTime, owningPseudoType));
+                         elapsedTime, PseudoTypeAsString(owningPseudoType)));
     // Then have the shared code below append an 'animationend':
     message = NS_ANIMATION_END;
   } else {
@@ -274,7 +274,7 @@ CSSAnimation::QueueEvents()
 
   manager->QueueEvent(
     AnimationEventInfo(owningElement, mAnimationName, message, elapsedTime,
-                       owningPseudoType));
+                       PseudoTypeAsString(owningPseudoType)));
 }
 
 CommonAnimationManager*
@@ -288,6 +288,19 @@ CSSAnimation::GetAnimationManager() const
   return context->AnimationManager();
 }
 
+/* static */ nsString
+CSSAnimation::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
+{
+  switch (aPseudoType) {
+    case nsCSSPseudoElements::ePseudo_before:
+      return NS_LITERAL_STRING("::before");
+    case nsCSSPseudoElements::ePseudo_after:
+      return NS_LITERAL_STRING("::after");
+    default:
+      return EmptyString();
+  }
+}
+
 ////////////////////////// nsAnimationManager ////////////////////////////
 
 NS_IMPL_CYCLE_COLLECTION(nsAnimationManager, mEventDispatcher)

layout/style/nsAnimationManager.h

@@ -32,13 +32,13 @@ struct AnimationEventInfo {
                      const nsSubstring& aAnimationName,
                      uint32_t aMessage,
                      const mozilla::StickyTimeDuration& aElapsedTime,
-                     nsCSSPseudoElements::Type aPseudoType)
+                     const nsAString& aPseudoElement)
     : mElement(aElement), mEvent(true, aMessage)
   {
     // XXX Looks like nobody initialize WidgetEvent::time
     mEvent.animationName = aAnimationName;
     mEvent.elapsedTime = aElapsedTime.ToSeconds();
-    mEvent.pseudoElement = AnimationCollection::PseudoTypeAsString(aPseudoType);
+    mEvent.pseudoElement = aPseudoElement;
   }
 
   // InternalAnimationEvent doesn't support copy-construction, so we need
@@ -165,6 +165,8 @@ protected:
 
   void QueueEvents();
 
+  static nsString PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType);
+
   nsString mAnimationName;
 
   // The (pseudo-)element whose computed animation-name refers to this

layout/style/nsTransitionManager.cpp

@@ -852,8 +852,7 @@ struct TransitionEventInfo {
   InternalTransitionEvent mEvent;
 
   TransitionEventInfo(nsIContent *aElement, nsCSSProperty aProperty,
-                      TimeDuration aDuration,
-                      nsCSSPseudoElements::Type aPseudoType)
+                      TimeDuration aDuration, const nsAString& aPseudoElement)
     : mElement(aElement)
     , mEvent(true, NS_TRANSITION_END)
   {
@@ -861,7 +860,7 @@ struct TransitionEventInfo {
     mEvent.propertyName =
       NS_ConvertUTF8toUTF16(nsCSSProps::GetStringValue(aProperty));
     mEvent.elapsedTime = aDuration.ToSeconds();
-    mEvent.pseudoElement = AnimationCollection::PseudoTypeAsString(aPseudoType);
+    mEvent.pseudoElement = aPseudoElement;
   }
 
   // InternalTransitionEvent doesn't support copy-construction, so we need
@@ -941,7 +940,8 @@ nsTransitionManager::FlushTransitions(FlushFlags aFlags)
               anim->GetEffect()->Timing().mIterationDuration;
             events.AppendElement(
               TransitionEventInfo(collection->mElement, prop,
-                                  duration, collection->PseudoElementType()));
+                                  duration,
+                                  collection->PseudoElement()));
 
             // Leave this transition in the list for one more refresh
             // cycle, since we haven't yet processed its style change, and