diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-14 09:16:03 +0100 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-14 09:16:03 +0100 |
| commit | 34ef9d4683b3e81b8df1be1a9c38eae331e8c398 (patch) | |
| tree | 2536466cf07202d6502938eb004d9c2f672def84 /layout/style/nsTransitionManager.cpp | |
| parent | 4644a03770ef95fd3acbaa205fae339b3a99f599 (diff) | |
| download | UXP-34ef9d4683b3e81b8df1be1a9c38eae331e8c398.tar UXP-34ef9d4683b3e81b8df1be1a9c38eae331e8c398.tar.gz UXP-34ef9d4683b3e81b8df1be1a9c38eae331e8c398.tar.lz UXP-34ef9d4683b3e81b8df1be1a9c38eae331e8c398.tar.xz UXP-34ef9d4683b3e81b8df1be1a9c38eae331e8c398.zip | |
Bug 1264125: Call the queueing events when canceling transition via Style or Script
Issue #55
Diffstat (limited to 'layout/style/nsTransitionManager.cpp')
| -rw-r--r-- | layout/style/nsTransitionManager.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp index 4a5ecdef6..da12a0ecd 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 }); } |