[Reland] Per WebViewScheduler virtual time

third_party/WebKit/Source/platform/Timer.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 48 matching lines @@
     }
 
     void stop();
     bool isActive() const;
     const WebTraceLocation& location() const { return m_location; }
 
     double nextFireInterval() const;
     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;
     }
 
     struct PLATFORM_EXPORT Comparator {
         bool operator()(const TimerBase* a, const TimerBase* b) const;
     };
 
 protected:
     static WebTaskRunner* UnthrottledWebTaskRunner();
 
 private:
     virtual void fired() = 0;
 
     virtual WebTaskRunner* timerTaskRunner();
 
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     virtual bool canFire() const { return true; }
 
+    double timerMonotonicallyIncreasingTime() const
+    {
+        return m_thread->monotonicallyIncreasingVirtualTimeSeconds();
+    }
+
     void setNextFireTime(double now, double delay);
 
     void runInternal();
 
     class CancellableTimerTask final : public WebTaskRunner::Task {
         WTF_MAKE_NONCOPYABLE(CancellableTimerTask);
     public:
         explicit CancellableTimerTask(TimerBase* timer) : m_timer(timer) { }
 
         NO_LAZY_SWEEP_SANITIZE_ADDRESS
@@ skipping 19 matching lines @@
         }
 
     private:
         TimerBase* m_timer; // NOT OWNED
     };
 
     double m_nextFireTime; // 0 if inactive
     double m_repeatInterval; // 0 if not repeating
     WebTraceLocation m_location;
     CancellableTimerTask* m_cancellableTimerTask; // NOT OWNED
-    WebTaskRunner* m_webTaskRunner; // Not owned.
-
-#if ENABLE(ASSERT)
-    ThreadIdentifier m_thread;
-#endif
+    WebThread* m_thread; // NOT OWNED
+    WebTaskRunner* m_webTaskRunner; // NOT OWNED
 
     friend class ThreadTimers;
     friend class TimerHeapLessThanFunction;
     friend class TimerHeapReference;
 };
 
 template<typename T, bool = IsGarbageCollectedType<T>::value>
 class TimerIsObjectAliveTrait {
 public:
     static bool isHeapObjectAlive(T*) { return true; }
@@ skipping 60 matching lines @@
 
     UnthrottledTimer(TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction)
         : Timer<TimerFiredClass>(timerFiredClass, timerFiredFunction, TimerBase::UnthrottledWebTaskRunner())
     {
     }
 };
 
 NO_LAZY_SWEEP_SANITIZE_ADDRESS
 inline bool TimerBase::isActive() const
 {
-    ASSERT(m_thread == currentThread());
+    ASSERT(m_thread->isCurrentThread());
     return m_cancellableTimerTask;
 }
 
 } // namespace blink
 
 #endif // Timer_h