summaryrefslogtreecommitdiff
path: root/layout/style/nsTransitionManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'layout/style/nsTransitionManager.cpp')
-rw-r--r--layout/style/nsTransitionManager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 4a5ecdef6d..da12a0ecdb 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -180,7 +180,7 @@ CSSTransition::UpdateTiming(SeekFlag aSeekFlag, SyncNotifyFlag aSyncNotifyFlag)
}
void
-CSSTransition::QueueEvents()
+CSSTransition::QueueEvents(StickyTimeDuration aActiveTime)
{
if (!mEffect ||
!mOwningElement.IsSet()) {
@@ -230,12 +230,9 @@ CSSTransition::QueueEvents()
// Handle cancel events firts
if (mPreviousTransitionPhase != TransitionPhase::Idle &&
currentPhase == TransitionPhase::Idle) {
- // FIXME: bug 1264125: We will need to get active time when cancelling
- // the transition.
- StickyTimeDuration activeTime(0);
- TimeStamp activeTimeStamp = ElapsedTimeToTimeStamp(activeTime);
+ TimeStamp activeTimeStamp = ElapsedTimeToTimeStamp(aActiveTime);
events.AppendElement(TransitionEventParams{ eTransitionCancel,
- activeTime,
+ aActiveTime,
activeTimeStamp });
}