Chromium Code Reviews| Index: Source/core/animation/AnimationClock.h |
| diff --git a/Source/core/animation/AnimationClock.h b/Source/core/animation/AnimationClock.h |
| index b5bb0d9adc6b5e13f1351019755fac8e21661591..5a77132bed2754ce3cbe42807b3f4c01769d7567 100644 |
| --- a/Source/core/animation/AnimationClock.h |
| +++ b/Source/core/animation/AnimationClock.h |
| @@ -31,7 +31,7 @@ |
| #ifndef AnimationClock_h |
| #define AnimationClock_h |
| -#include "wtf/CurrentTime.h" |
| +#include "public/platform/WebFrameTime.h" |
| #include "wtf/Noncopyable.h" |
| #include "wtf/PassOwnPtr.h" |
| #include <limits> |
| @@ -41,22 +41,24 @@ namespace WebCore { |
| class AnimationClock { |
| WTF_MAKE_NONCOPYABLE(AnimationClock); |
| public: |
| - explicit AnimationClock(WTF::TimeFunction monotonicallyIncreasingTime = WTF::monotonicallyIncreasingTime) |
| - : m_monotonicallyIncreasingTime(monotonicallyIncreasingTime) |
| - , m_time(0) |
| + explicit AnimationClock() |
| + : m_frameTime(blink::WebFrameTime::CreateNull()) |
|
eseidel
2014/07/07 19:31:16
Blink API is in Blink style, so CreateNull() is wr
mithro-old
2014/07/08 04:28:30
I had a quick re-read of the Blink Coding Style to
|
| , m_currentTask(std::numeric_limits<unsigned>::max()) |
| { |
| } |
| - void updateTime(double time); |
| + void updateTime(blink::WebFrameTime); |
| double currentTime(); |
| - void resetTimeForTesting(); |
| - |
| static void notifyTaskStart() { ++s_currentTask; } |
| + void resetTimeForTesting(); |
| + void tickTimeForTesting(); |
| + void clearTimeForTesting(); |
| + |
| private: |
| - WTF::TimeFunction m_monotonicallyIncreasingTime; |
| - double m_time; |
| + double internalCurrentTime(); |
| + |
| + blink::WebFrameTime m_frameTime; |
| unsigned m_currentTask; |
| static unsigned s_currentTask; |
| }; |