Refactor Timer classes in preparation for landing FrameTimers.

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 26 matching lines @@
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 // Time intervals are all in seconds.
 
 class PLATFORM_EXPORT TimerBase {
     WTF_MAKE_NONCOPYABLE(TimerBase);
 public:
-    TimerBase();
     explicit TimerBase(WebTaskRunner*);
     virtual ~TimerBase();
 
     void start(double nextFireInterval, double repeatInterval, const WebTraceLocation&);
 
     void startRepeating(double repeatInterval, const WebTraceLocation& caller)
     {
         start(repeatInterval, repeatInterval, caller);
     }
     void startOneShot(double interval, const WebTraceLocation& caller)
@@ skipping 12 matching lines @@
         double now = timerMonotonicallyIncreasingTime();
         setNextFireTime(now, std::max(m_nextFireTime - now + delta, 0.0));
         m_repeatInterval += delta;
     }
 
     struct PLATFORM_EXPORT Comparator {
         bool operator()(const TimerBase* a, const TimerBase* b) const;
     };
 
 protected:
-    static WebTaskRunner* UnthrottledWebTaskRunner();
+    static WebTaskRunner* getTimerTaskRunner();
+    static WebTaskRunner* getUnthrottledTaskRunner();
 
 private:
     virtual void fired() = 0;
 
     virtual WebTaskRunner* timerTaskRunner() const;
 
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     virtual bool canFire() const { return true; }
 
     double timerMonotonicallyIncreasingTime() const;
@@ skipping 57 matching lines @@
 template<typename T>
 class TimerIsObjectAliveTrait<T, true> {
 public:
     static bool isHeapObjectAlive(T* objectPointer)
     {
         return !ThreadHeap::willObjectBeLazilySwept(objectPointer);
     }
 };
 
 template <typename TimerFiredClass>
-class Timer : public TimerBase {
+class TaskRunnerTimer : public TimerBase {
 public:
-    using TimerFiredFunction = void (TimerFiredClass::*)(Timer<TimerFiredClass>*);
+    using TimerFiredFunction = void (TimerFiredClass::*)(TimerBase*);
 
-    // TODO(dcheng): Consider removing this overload once all timers are using the
-    // appropriate task runner. https://crbug.com/624694
-    Timer(TimerFiredClass* o, TimerFiredFunction f)
-        : m_object(o), m_function(f)
-    {
-    }
-
-    Timer(TimerFiredClass* o, TimerFiredFunction f, WebTaskRunner* webTaskRunner)
+    TaskRunnerTimer(WebTaskRunner* webTaskRunner, TimerFiredClass* o, TimerFiredFunction f)
         : TimerBase(webTaskRunner), m_object(o), m_function(f)
     {
     }
 
-    ~Timer() override { }
+    ~TaskRunnerTimer() override { }
 
 protected:
     void fired() override
     {
         (m_object->*m_function)(this);
     }
 
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     bool canFire() const override
     {
         // Oilpan: if a timer fires while Oilpan heaps are being lazily
         // swept, it is not safe to proceed if the object is about to
         // be swept (and this timer will be stopped while doing so.)
         return TimerIsObjectAliveTrait<TimerFiredClass>::isHeapObjectAlive(m_object);
     }
 
 private:
     // FIXME: Oilpan: TimerBase should be moved to the heap and m_object should be traced.
     // This raw pointer is safe as long as Timer<X> is held by the X itself (That's the case
     // in the current code base).
     GC_PLUGIN_IGNORE("363031")
     TimerFiredClass* m_object;
     TimerFiredFunction m_function;
 };
 
+// TODO(dcheng): Consider removing this overload once all timers are using the
+// appropriate task runner. https://crbug.com/624694
+template <typename TimerFiredClass>
+class Timer : public TaskRunnerTimer<TimerFiredClass> {
+public:
+    using TimerFiredFunction = typename TaskRunnerTimer<TimerFiredClass>::TimerFiredFunction;
+
+    ~Timer() override { }
+
+    Timer(TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction)
+        : TaskRunnerTimer<TimerFiredClass>(TimerBase::getTimerTaskRunner(), timerFiredClass, timerFiredFunction)
+    {
+    }
+};
+
+
 // This subclass of Timer posts its tasks on the current thread's default task runner.
 // Tasks posted on there are not throttled when the tab is in the background.
 template <typename TimerFiredClass>
-class UnthrottledTimer : public Timer<TimerFiredClass> {
+class UnthrottledThreadTimer : public TaskRunnerTimer<TimerFiredClass> {
 public:
-    using TimerFiredFunction = void (TimerFiredClass::*)(Timer<TimerFiredClass>*);
+    using TimerFiredFunction = typename TaskRunnerTimer<TimerFiredClass>::TimerFiredFunction;
 
-    ~UnthrottledTimer() override { }
+    ~UnthrottledThreadTimer() override { }
 
-    UnthrottledTimer(TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction)
-        : Timer<TimerFiredClass>(timerFiredClass, timerFiredFunction, TimerBase::UnthrottledWebTaskRunner())
+    UnthrottledThreadTimer(TimerFiredClass* timerFiredClass, TimerFiredFunction timerFiredFunction)
+        : TaskRunnerTimer<TimerFiredClass>(TimerBase::getUnthrottledTaskRunner(), timerFiredClass, timerFiredFunction)
     {
     }
 };
 
 NO_LAZY_SWEEP_SANITIZE_ADDRESS
 inline bool TimerBase::isActive() const
 {
     ASSERT(m_thread == currentThread());
     return m_cancellableTimerTask;
 }
 
 } // namespace blink
 
 #endif // Timer_h