Bug 1259676 - part2: rename from 'InternalAnimationEvent.elapsedTime' to 'InternalAnimationEvent.mElapsedTime'. r=masayuki
authorTetsuharu OHZEKI <saneyuki.snyk@gmail.com>
Sat, 26 Mar 2016 13:37:19 +0900
changeset 290557 4c4d2c6884307f11ca3e8e741fff3e8e7a2db3c3
parent 290556 1bfc39d87c3e71ffde4482abcd976668155c115b
child 290558 98a3326050d8d4ee86efd281e9da92cdf79e9748
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1259676
milestone48.0a1
Bug 1259676 - part2: rename from 'InternalAnimationEvent.elapsedTime' to 'InternalAnimationEvent.mElapsedTime'. r=masayuki MozReview-Commit-ID: 4n5YQwxLeAx
dom/events/AnimationEvent.cpp
layout/style/nsAnimationManager.h
widget/ContentEvents.h
--- a/dom/events/AnimationEvent.cpp
+++ b/dom/events/AnimationEvent.cpp
@@ -43,17 +43,17 @@ AnimationEvent::Constructor(const Global
   nsCOMPtr<EventTarget> t = do_QueryInterface(aGlobal.GetAsSupports());
   RefPtr<AnimationEvent> e = new AnimationEvent(t, nullptr, nullptr);
   bool trusted = e->Init(t);
 
   e->InitEvent(aType, aParam.mBubbles, aParam.mCancelable);
 
   InternalAnimationEvent* internalEvent = e->mEvent->AsAnimationEvent();
   internalEvent->mAnimationName = aParam.mAnimationName;
-  internalEvent->elapsedTime = aParam.mElapsedTime;
+  internalEvent->mElapsedTime = aParam.mElapsedTime;
   internalEvent->pseudoElement = aParam.mPseudoElement;
 
   e->SetTrusted(trusted);
   return e.forget();
 }
 
 NS_IMETHODIMP
 AnimationEvent::GetAnimationName(nsAString& aAnimationName)
@@ -67,17 +67,17 @@ AnimationEvent::GetElapsedTime(float* aE
 {
   *aElapsedTime = ElapsedTime();
   return NS_OK;
 }
 
 float
 AnimationEvent::ElapsedTime()
 {
-  return mEvent->AsAnimationEvent()->elapsedTime;
+  return mEvent->AsAnimationEvent()->mElapsedTime;
 }
 
 NS_IMETHODIMP
 AnimationEvent::GetPseudoElement(nsAString& aPseudoElement)
 {
   aPseudoElement = mEvent->AsAnimationEvent()->pseudoElement;
   return NS_OK;
 }
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -42,17 +42,17 @@ struct AnimationEventInfo {
                      dom::Animation* aAnimation)
     : mElement(aElement)
     , mAnimation(aAnimation)
     , mEvent(true, aMessage)
     , mTimeStamp(aTimeStamp)
   {
     // XXX Looks like nobody initialize WidgetEvent::time
     mEvent.mAnimationName = aAnimationName;
-    mEvent.elapsedTime = aElapsedTime.ToSeconds();
+    mEvent.mElapsedTime = aElapsedTime.ToSeconds();
     mEvent.pseudoElement =
       AnimationCollection<dom::CSSAnimation>::PseudoTypeAsString(aPseudoType);
   }
 
   // InternalAnimationEvent doesn't support copy-construction, so we need
   // to ourselves in order to work with nsTArray
   AnimationEventInfo(const AnimationEventInfo& aOther)
     : mElement(aOther.mElement)
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -282,43 +282,43 @@ class InternalAnimationEvent : public Wi
 public:
   virtual InternalAnimationEvent* AsAnimationEvent() override
   {
     return this;
   }
 
   InternalAnimationEvent(bool aIsTrusted, EventMessage aMessage)
     : WidgetEvent(aIsTrusted, aMessage, eAnimationEventClass)
-    , elapsedTime(0.0)
+    , mElapsedTime(0.0)
   {
     mFlags.mCancelable = false;
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     MOZ_ASSERT(mClass == eAnimationEventClass,
                "Duplicate() must be overridden by sub class");
     InternalAnimationEvent* result =
       new InternalAnimationEvent(false, mMessage);
     result->AssignAnimationEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
   nsString mAnimationName;
-  float elapsedTime;
+  float mElapsedTime;
   nsString pseudoElement;
 
   void AssignAnimationEventData(const InternalAnimationEvent& aEvent,
                                 bool aCopyTargets)
   {
     AssignEventData(aEvent, aCopyTargets);
 
     mAnimationName = aEvent.mAnimationName;
-    elapsedTime = aEvent.elapsedTime;
+    mElapsedTime = aEvent.mElapsedTime;
     pseudoElement = aEvent.pseudoElement;
   }
 };
 
 /******************************************************************************
  * mozilla::InternalSVGZoomEvent
  ******************************************************************************/