Bug 895274 part.173 Rename NS_ANIMATION_ITERATION to eAnimationIteration r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 11 Sep 2015 01:59:53 +0900
changeset 296127 d040b1903b432cc75f153c5ec9e7aa04bf9aaa86
parent 296126 af23abc48df4250a24f4f4c8bbc82a0e9cb2321f
child 296128 96ec3affa3d526bf405cfb33172142415e757da9
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [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.173 Rename NS_ANIMATION_ITERATION to eAnimationIteration r=smaug
dom/events/EventNameList.h
layout/style/nsAnimationManager.cpp
widget/EventMessageList.h
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -912,17 +912,17 @@ NON_IDL_EVENT(animationstart,
               eAnimationStart,
               EventNameType_None,
               eAnimationEventClass)
 NON_IDL_EVENT(animationend,
               eAnimationEnd,
               EventNameType_None,
               eAnimationEventClass)
 NON_IDL_EVENT(animationiteration,
-              NS_ANIMATION_ITERATION,
+              eAnimationIteration,
               EventNameType_None,
               eAnimationEventClass)
 
 NON_IDL_EVENT(audioprocess,
               NS_AUDIO_PROCESS,
               EventNameType_None,
               eBasicEventClass)
 
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -238,17 +238,17 @@ CSSAnimation::QueueEvents()
 
   EventMessage message;
 
   if (!wasActive && isActive) {
     message = eAnimationStart;
   } else if (wasActive && !isActive) {
     message = eAnimationEnd;
   } else if (wasActive && isActive && !isSameIteration) {
-    message = NS_ANIMATION_ITERATION;
+    message = eAnimationIteration;
   } 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,
@@ -256,18 +256,17 @@ CSSAnimation::QueueEvents()
     // Then have the shared code below append an 'animationend':
     message = eAnimationEnd;
   } else {
     return; // No events need to be sent
   }
 
   StickyTimeDuration elapsedTime;
 
-  if (message == eAnimationStart ||
-      message == NS_ANIMATION_ITERATION) {
+  if (message == eAnimationStart || message == eAnimationIteration) {
     TimeDuration iterationStart = mEffect->Timing().mIterationDuration *
                                     computedTiming.mCurrentIteration;
     elapsedTime = StickyTimeDuration(std::max(iterationStart,
                                               mEffect->InitialAdvance()));
   } else {
     MOZ_ASSERT(message == eAnimationEnd);
     elapsedTime = computedTiming.mActiveDuration;
   }
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -321,20 +321,20 @@ NS_EVENT_MESSAGE(NS_GESTURENOTIFY_EVENT_
 NS_EVENT_MESSAGE(NS_ORIENTATION_EVENT,  4000)
 
 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(eAnimationEnd,          eAnimationEventFirst + 1)
-NS_EVENT_MESSAGE(NS_ANIMATION_ITERATION, eAnimationEventFirst + 2)
+NS_EVENT_MESSAGE(eAnimationEventFirst,  4250)
+NS_EVENT_MESSAGE(eAnimationStart,       eAnimationEventFirst)
+NS_EVENT_MESSAGE(eAnimationEnd,         eAnimationEventFirst + 1)
+NS_EVENT_MESSAGE(eAnimationIteration,   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)
 NS_EVENT_MESSAGE(NS_AUDIO_PROCESS,      NS_WEBAUDIO_EVENT_START)