[Reland] Per WebViewScheduler virtual time

third_party/WebKit/Source/platform/Timer.h

Index: third_party/WebKit/Source/platform/Timer.h
diff --git a/third_party/WebKit/Source/platform/Timer.h b/third_party/WebKit/Source/platform/Timer.h
index 8354eca242672535b65684e9c9b053b6decff659..dc475793d8ea8e937ff48807e77f2ed5bb73fdad 100644
--- a/third_party/WebKit/Source/platform/Timer.h
+++ b/third_party/WebKit/Source/platform/Timer.h
@@ -67,7 +67,7 @@ public:
     double repeatInterval() const { return m_repeatInterval; }
 
     void augmentRepeatInterval(double delta) {
-        double now = monotonicallyIncreasingTime();
+        double now = timerMonotonicallyIncreasingTime();
         setNextFireTime(now, m_nextFireTime - now + delta);
         m_repeatInterval += delta;
     }
@@ -82,11 +82,16 @@ protected:
 private:
     virtual void fired() = 0;
 
-    virtual WebTaskRunner* timerTaskRunner();
+    virtual WebTaskRunner* timerTaskRunner() const;
 
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     virtual bool canFire() const { return true; }
 
+    double timerMonotonicallyIncreasingTime() const
+    {

[esprehn, 2016/02/23 10:30:11]

Does this really need to be inline in the header?

[alex clarke (OOO till 29th), 2016/02/23 17:16:57]

I guess it doesn't really matter if it's defined in the cpp file.

Done.

+        return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();
+    }
+
     void setNextFireTime(double now, double delay);
 
     void runInternal();