Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1259675 - Clean up InternalTransitionEvent r=masayuki

Browse Source 
MozReview-Commit-ID: 8fTJ4Z9yJGl

--HG--
extra : rebase_source : 7c461ee6124e4e7cce0a709b3dfe2c97c6df9e8f
This commit is contained in:
takayuki_yamaguchi 2016-03-26 16:26:35 +09:00
parent 8fe5a1b9d4
commit da0885219b
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/events/TransitionEvent.cpp
View File

@ -47,9 +47,9 @@ TransitionEvent::Constructor(const GlobalObject& aGlobal,
e->InitEvent(aType, aParam.mBubbles, aParam.mCancelable);
InternalTransitionEvent* internalEvent = e->mEvent->AsTransitionEvent();
internalEvent->propertyName = aParam.mPropertyName;
internalEvent->elapsedTime = aParam.mElapsedTime;
internalEvent->pseudoElement = aParam.mPseudoElement;
internalEvent->mPropertyName = aParam.mPropertyName;
internalEvent->mElapsedTime = aParam.mElapsedTime;
internalEvent->mPseudoElement = aParam.mPseudoElement;
e->SetTrusted(trusted);
return e.forget();
@ -58,7 +58,7 @@ TransitionEvent::Constructor(const GlobalObject& aGlobal,
NS_IMETHODIMP
TransitionEvent::GetPropertyName(nsAString& aPropertyName)
{
aPropertyName = mEvent->AsTransitionEvent()->propertyName;
aPropertyName = mEvent->AsTransitionEvent()->mPropertyName;
return NS_OK;
}
@ -72,13 +72,13 @@ TransitionEvent::GetElapsedTime(float* aElapsedTime)
float
TransitionEvent::ElapsedTime()
{
return mEvent->AsTransitionEvent()->elapsedTime;
return mEvent->AsTransitionEvent()->mElapsedTime;
}
NS_IMETHODIMP
TransitionEvent::GetPseudoElement(nsAString& aPseudoElement)
{
aPseudoElement = mEvent->AsTransitionEvent()->pseudoElement;
aPseudoElement = mEvent->AsTransitionEvent()->mPseudoElement;
return NS_OK;
}

6
layout/style/nsTransitionManager.h
View File

@ -250,10 +250,10 @@ struct TransitionEventInfo {
, mTimeStamp(aTimeStamp)
{
// XXX Looks like nobody initialize WidgetEvent::time
mEvent.propertyName =
mEvent.mPropertyName =
NS_ConvertUTF8toUTF16(nsCSSProps::GetStringValue(aProperty));
mEvent.elapsedTime = aDuration.ToSeconds();
mEvent.pseudoElement =
mEvent.mElapsedTime = aDuration.ToSeconds();
mEvent.mPseudoElement =
AnimationCollection<dom::CSSTransition>::PseudoTypeAsString(aPseudoType);
}

14
widget/ContentEvents.h
View File

@ -242,7 +242,7 @@ public:
InternalTransitionEvent(bool aIsTrusted, EventMessage aMessage)
: WidgetEvent(aIsTrusted, aMessage, eTransitionEventClass)
, elapsedTime(0.0)
, mElapsedTime(0.0)
{
mFlags.mCancelable = false;
}
@ -258,18 +258,18 @@ public:
return result;
}
nsString propertyName;
float elapsedTime;
nsString pseudoElement;
nsString mPropertyName;
nsString mPseudoElement;
float mElapsedTime;
void AssignTransitionEventData(const InternalTransitionEvent& aEvent,
bool aCopyTargets)
{
AssignEventData(aEvent, aCopyTargets);
propertyName = aEvent.propertyName;
elapsedTime = aEvent.elapsedTime;
pseudoElement = aEvent.pseudoElement;
mPropertyName = aEvent.mPropertyName;
mElapsedTime = aEvent.mElapsedTime;
mPseudoElement = aEvent.mPseudoElement;
}
};