Bug 895274 part.172 Rename NS_ANIMATION_END to eAnimationEnd r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 11 Sep 2015 01:59:53 +0900
changeset 294421 af23abc48df4250a24f4f4c8bbc82a0e9cb2321f
parent 294420 67254ef03f091f2ca85a22e6d796f734834e8766
child 294422 d040b1903b432cc75f153c5ec9e7aa04bf9aaa86
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895274 part.172 Rename NS_ANIMATION_END to eAnimationEnd r=smaug
dom/events/EventNameList.h
layout/style/nsAnimationManager.cpp
widget/EventMessageList.h
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -908,17 +908,17 @@ NON_IDL_EVENT(transitionend,
               NS_TRANSITION_END,
               EventNameType_None,
               eTransitionEventClass)
 NON_IDL_EVENT(animationstart,
               eAnimationStart,
               EventNameType_None,
               eAnimationEventClass)
 NON_IDL_EVENT(animationend,
-              NS_ANIMATION_END,
+              eAnimationEnd,
               EventNameType_None,
               eAnimationEventClass)
 NON_IDL_EVENT(animationiteration,
               NS_ANIMATION_ITERATION,
               EventNameType_None,
               eAnimationEventClass)
 
 NON_IDL_EVENT(audioprocess,
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -236,44 +236,44 @@ CSSAnimation::QueueEvents()
     mPreviousPhaseOrIteration = PREVIOUS_PHASE_AFTER;
   }
 
   EventMessage message;
 
   if (!wasActive && isActive) {
     message = eAnimationStart;
   } else if (wasActive && !isActive) {
-    message = NS_ANIMATION_END;
+    message = eAnimationEnd;
   } else if (wasActive && isActive && !isSameIteration) {
     message = NS_ANIMATION_ITERATION;
   } else if (skippedActivePhase) {
     // First notifying for start of 0th iteration by appending an
     // 'animationstart':
     StickyTimeDuration elapsedTime =
       std::min(StickyTimeDuration(mEffect->InitialAdvance()),
                computedTiming.mActiveDuration);
     manager->QueueEvent(
       AnimationEventInfo(owningElement, mAnimationName, eAnimationStart,
                          elapsedTime, owningPseudoType));
     // Then have the shared code below append an 'animationend':
-    message = NS_ANIMATION_END;
+    message = eAnimationEnd;
   } else {
     return; // No events need to be sent
   }
 
   StickyTimeDuration elapsedTime;
 
   if (message == eAnimationStart ||
       message == NS_ANIMATION_ITERATION) {
     TimeDuration iterationStart = mEffect->Timing().mIterationDuration *
                                     computedTiming.mCurrentIteration;
     elapsedTime = StickyTimeDuration(std::max(iterationStart,
                                               mEffect->InitialAdvance()));
   } else {
-    MOZ_ASSERT(message == NS_ANIMATION_END);
+    MOZ_ASSERT(message == eAnimationEnd);
     elapsedTime = computedTiming.mActiveDuration;
   }
 
   manager->QueueEvent(
     AnimationEventInfo(owningElement, mAnimationName, message, elapsedTime,
                        owningPseudoType));
 }
 
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -323,17 +323,17 @@ NS_EVENT_MESSAGE(NS_ORIENTATION_EVENT,  
 NS_EVENT_MESSAGE(NS_SCROLLAREA_EVENT_START, 4100)
 NS_EVENT_MESSAGE(NS_SCROLLEDAREACHANGED, NS_SCROLLAREA_EVENT_START)
 
 NS_EVENT_MESSAGE(NS_TRANSITION_EVENT_START, 4200)
 NS_EVENT_MESSAGE(NS_TRANSITION_END,     NS_TRANSITION_EVENT_START)
 
 NS_EVENT_MESSAGE(eAnimationEventFirst,   4250)
 NS_EVENT_MESSAGE(eAnimationStart,        eAnimationEventFirst)
-NS_EVENT_MESSAGE(NS_ANIMATION_END,       eAnimationEventFirst + 1)
+NS_EVENT_MESSAGE(eAnimationEnd,          eAnimationEventFirst + 1)
 NS_EVENT_MESSAGE(NS_ANIMATION_ITERATION, eAnimationEventFirst + 2)
 
 NS_EVENT_MESSAGE(NS_SMIL_TIME_EVENT_START, 4300)
 NS_EVENT_MESSAGE(NS_SMIL_BEGIN,         NS_SMIL_TIME_EVENT_START)
 NS_EVENT_MESSAGE(NS_SMIL_END,           NS_SMIL_TIME_EVENT_START + 1)
 NS_EVENT_MESSAGE(NS_SMIL_REPEAT,        NS_SMIL_TIME_EVENT_START + 2)
 
 NS_EVENT_MESSAGE(NS_WEBAUDIO_EVENT_START, 4350)