| Index: Source/core/animation/AnimationPlayer.h
|
| diff --git a/Source/core/animation/AnimationPlayer.h b/Source/core/animation/AnimationPlayer.h
|
| index 6efd5c7cb33aadb7445c4fc4ffd98a44bd127d8a..397e857b7b2c113e036152acc2d24c7a206ad19b 100644
|
| --- a/Source/core/animation/AnimationPlayer.h
|
| +++ b/Source/core/animation/AnimationPlayer.h
|
| @@ -65,6 +65,7 @@ public:
|
| double currentTime();
|
| void setCurrentTime(double newCurrentTime);
|
|
|
| + double calculateCurrentTime() const;
|
| double currentTimeInternal();
|
| void setCurrentTimeInternal(double newCurrentTime);
|
|
|
| @@ -105,9 +106,6 @@ public:
|
| AnimationNode* source() { return m_content.get(); }
|
| void setSource(AnimationNode*);
|
|
|
| - double timeLag() { return timeLagInternal() * 1000; }
|
| - double timeLagInternal() { return currentTimeWithoutLag() - currentTimeInternal(); }
|
| -
|
| // Pausing via this method is not reflected in the value returned by
|
| // paused() and must never overlap with pausing via pause().
|
| void pauseForTesting(double pauseTime);
|
| @@ -159,15 +157,11 @@ private:
|
| AnimationPlayer(ExecutionContext*, AnimationTimeline&, AnimationNode*);
|
| double sourceEnd() const;
|
| bool limited(double currentTime) const;
|
| - double currentTimeWithoutLag() const;
|
| - double currentTimeWithLag() const;
|
| - void updateTimingState(double newCurrentTime);
|
| void updateCurrentTimingState();
|
|
|
| double m_playbackRate;
|
| double m_startTime;
|
| double m_holdTime;
|
| - double m_storedTimeLag;
|
|
|
| SortInfo m_sortInfo;
|
|
|
| @@ -178,8 +172,8 @@ private:
|
| bool m_held;
|
| bool m_isPausedForTesting;
|
|
|
| - // This indicates timing information relevant to the player has changed by
|
| - // means other than the ordinary progression of time
|
| + // This indicates timing information relevant to the player's effect
|
| + // has changed by means other than the ordinary progression of time
|
| bool m_outdated;
|
|
|
| bool m_finished;
|
|
|