Bug 1354501 - Change event target variable type to EventTarget and rename it to mTarget. r=birtles

That's because the target for web animation events (i.e. finish and cancel)
is an Animation instance.

MozReview-Commit-ID: 5xR325FXUo

--HG--
extra : rebase_source : 9bd0623ece1dc449d52db283882fe236dbc11c6d
This commit is contained in:
Hiroyuki Ikezoe 2018-07-03 09:25:02 +09:00
parent 1c47aa1edf
commit 7374654896
2 changed files with 6 additions and 6 deletions

View File

@ -17,8 +17,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AnimationEventDispatcher)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AnimationEventDispatcher)
for (auto& info : tmp->mPendingEvents) {
ImplCycleCollectionTraverse(cb, info.mElement,
"mozilla::AnimationEventDispatcher.mPendingEvents.mElement");
ImplCycleCollectionTraverse(cb, info.mTarget,
"mozilla::AnimationEventDispatcher.mPendingEvents.mTarget");
ImplCycleCollectionTraverse(cb, info.mAnimation,
"mozilla::AnimationEventDispatcher.mPendingEvents.mAnimation");
}

View File

@ -23,7 +23,7 @@ namespace mozilla {
struct AnimationEventInfo
{
RefPtr<dom::Element> mElement;
RefPtr<dom::EventTarget> mTarget;
RefPtr<dom::Animation> mAnimation;
TimeStamp mTimeStamp;
@ -37,7 +37,7 @@ struct AnimationEventInfo
double aElapsedTime,
const TimeStamp& aTimeStamp,
dom::Animation* aAnimation)
: mElement(aTarget.mElement)
: mTarget(aTarget.mElement)
, mAnimation(aAnimation)
, mTimeStamp(aTimeStamp)
, mEvent(EventVariant(InternalAnimationEvent(true, aMessage)))
@ -58,7 +58,7 @@ struct AnimationEventInfo
double aElapsedTime,
const TimeStamp& aTimeStamp,
dom::Animation* aAnimation)
: mElement(aTarget.mElement)
: mTarget(aTarget.mElement)
, mAnimation(aAnimation)
, mTimeStamp(aTimeStamp)
, mEvent(EventVariant(InternalTransitionEvent(true, aMessage)))
@ -128,7 +128,7 @@ public:
MOZ_ASSERT(!info.AsWidgetEvent()->mFlags.mIsBeingDispatched &&
!info.AsWidgetEvent()->mFlags.mDispatchedAtLeastOnce,
"The WidgetEvent should be fresh");
EventDispatcher::Dispatch(info.mElement,
EventDispatcher::Dispatch(info.mTarget,
mPresContext,
info.AsWidgetEvent());