[Reland] Per WebViewScheduler virtual time

third_party/WebKit/Source/platform/Timer.cpp

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 4dbaea668b3d160958b7f8a841bbf7e4de65d237..9e688ddeb22dc604e1a84492f7eec73008c1f14a 100644
--- a/third_party/WebKit/Source/platform/Timer.cpp
+++ b/third_party/WebKit/Source/platform/Timer.cpp
@@ -65,7 +65,7 @@ void TimerBase::start(double nextFireInterval, double repeatInterval, const WebT
 
     m_location = caller;
     m_repeatInterval = repeatInterval;
-    setNextFireTime(monotonicallyIncreasingTime(), nextFireInterval);
+    setNextFireTime(timerMonotonicallyIncreasingTime(), nextFireInterval);
 }
 
 void TimerBase::stop()
@@ -82,13 +82,13 @@ void TimerBase::stop()
 double TimerBase::nextFireInterval() const
 {
     ASSERT(isActive());
-    double current = monotonicallyIncreasingTime();
+    double current = timerMonotonicallyIncreasingTime();
     if (m_nextFireTime < current)
         return 0;
     return m_nextFireTime - current;
 }
 
-WebTaskRunner* TimerBase::timerTaskRunner()
+WebTaskRunner* TimerBase::timerTaskRunner() const
 {
     return m_webTaskRunner;
 }
@@ -121,13 +121,13 @@ void TimerBase::runInternal()
     TRACE_EVENT_SET_SAMPLING_STATE("blink", "BlinkInternal");
 
     if (m_repeatInterval) {
-        double now = monotonicallyIncreasingTime();
+        double now = timerMonotonicallyIncreasingTime();
         // 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(monotonicallyIncreasingTime(), intervalToNextFireTime);
+        setNextFireTime(timerMonotonicallyIncreasingTime(), intervalToNextFireTime);
     } else {
         m_nextFireTime = 0;
     }
@@ -146,4 +146,9 @@ WebTaskRunner* TimerBase::UnthrottledWebTaskRunner()
     return Platform::current()->currentThread()->taskRunner();
 }
 
+double TimerBase::timerMonotonicallyIncreasingTime() const
+{
+    return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();
+}
+
 } // namespace blink