| Index: third_party/WebKit/Source/platform/Timer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/Timer.cpp b/third_party/WebKit/Source/platform/Timer.cpp
|
| index 9e688ddeb22dc604e1a84492f7eec73008c1f14a..4dbaea668b3d160958b7f8a841bbf7e4de65d237 100644
|
| --- a/third_party/WebKit/Source/platform/Timer.cpp
|
| +++ b/third_party/WebKit/Source/platform/Timer.cpp
|
| @@ -65,7 +65,7 @@
|
|
|
| m_location = caller;
|
| m_repeatInterval = repeatInterval;
|
| - setNextFireTime(timerMonotonicallyIncreasingTime(), nextFireInterval);
|
| + setNextFireTime(monotonicallyIncreasingTime(), nextFireInterval);
|
| }
|
|
|
| void TimerBase::stop()
|
| @@ -82,13 +82,13 @@
|
| double TimerBase::nextFireInterval() const
|
| {
|
| ASSERT(isActive());
|
| - double current = timerMonotonicallyIncreasingTime();
|
| + double current = monotonicallyIncreasingTime();
|
| if (m_nextFireTime < current)
|
| return 0;
|
| return m_nextFireTime - current;
|
| }
|
|
|
| -WebTaskRunner* TimerBase::timerTaskRunner() const
|
| +WebTaskRunner* TimerBase::timerTaskRunner()
|
| {
|
| return m_webTaskRunner;
|
| }
|
| @@ -121,13 +121,13 @@
|
| TRACE_EVENT_SET_SAMPLING_STATE("blink", "BlinkInternal");
|
|
|
| if (m_repeatInterval) {
|
| - double now = timerMonotonicallyIncreasingTime();
|
| + double now = monotonicallyIncreasingTime();
|
| // This computation should be drift free, and it will cope if we miss a beat,
|
| // which can easily happen if the thread is busy. It will also cope if we get
|
| // called slightly before m_unalignedNextFireTime, which can happen due to lack
|
| // of timer precision.
|
| double intervalToNextFireTime = m_repeatInterval - fmod(now - m_nextFireTime, m_repeatInterval);
|
| - setNextFireTime(timerMonotonicallyIncreasingTime(), intervalToNextFireTime);
|
| + setNextFireTime(monotonicallyIncreasingTime(), intervalToNextFireTime);
|
| } else {
|
| m_nextFireTime = 0;
|
| }
|
| @@ -146,9 +146,4 @@
|
| return Platform::current()->currentThread()->taskRunner();
|
| }
|
|
|
| -double TimerBase::timerMonotonicallyIncreasingTime() const
|
| -{
|
| - return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();
|
| -}
|
| -
|
| } // namespace blink
|
|
|