diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-14 08:26:26 +0100 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-14 08:26:26 +0100 |
| commit | c4730100294c28df0a170f47565ded7eebfaba49 (patch) | |
| tree | eb8d163ec57c260be8db592688e7d7ba0f434a57 /layout/style/nsAnimationManager.h | |
| parent | d2a0a16054771b4b0bee38ee7241a976bc1dac75 (diff) | |
| download | UXP-c4730100294c28df0a170f47565ded7eebfaba49.tar UXP-c4730100294c28df0a170f47565ded7eebfaba49.tar.gz UXP-c4730100294c28df0a170f47565ded7eebfaba49.tar.lz UXP-c4730100294c28df0a170f47565ded7eebfaba49.tar.xz UXP-c4730100294c28df0a170f47565ded7eebfaba49.zip | |
Bug 1202333: AnimationEvent elapsedTime should reflect playbackRate (without tests)
Issue #55
Diffstat (limited to 'layout/style/nsAnimationManager.h')
| -rw-r--r-- | layout/style/nsAnimationManager.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h index abe3aeeb8..868d4bb42 100644 --- a/layout/style/nsAnimationManager.h +++ b/layout/style/nsAnimationManager.h @@ -76,7 +76,8 @@ public: , mIsStylePaused(false) , mPauseShouldStick(false) , mNeedsNewAnimationIndexWhenRun(false) - , mPreviousPhaseOrIteration(PREVIOUS_PHASE_BEFORE) + , mPreviousPhase(ComputedTiming::AnimationPhase::Null) + , mPreviousIteration(0) { // We might need to drop this assertion once we add a script-accessible // constructor but for animations generated from CSS markup the @@ -257,13 +258,10 @@ protected: // its animation index should be updated. bool mNeedsNewAnimationIndexWhenRun; - enum { - PREVIOUS_PHASE_BEFORE = uint64_t(-1), - PREVIOUS_PHASE_AFTER = uint64_t(-2) - }; - // One of the PREVIOUS_PHASE_* constants, or an integer for the iteration - // whose start we last notified on. - uint64_t mPreviousPhaseOrIteration; + // Phase and current iteration from the previous time we queued events. + // This is used to determine what new events to dispatch. + ComputedTiming::AnimationPhase mPreviousPhase; + uint64_t mPreviousIteration; }; } /* namespace dom */ |