Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/platform/Timer.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google 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
@@ skipping 22 matching lines @@
 #include "wtf/Atomics.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HashSet.h"
 #include <algorithm>
 #include <limits.h>
 #include <limits>
 #include <math.h>
 
 namespace blink {
 
-TimerBase::TimerBase() : TimerBase(Platform::current()->currentThread()->scheduler()->timerTaskRunner()) { }
-
 TimerBase::TimerBase(WebTaskRunner* webTaskRunner)
     : m_nextFireTime(0)
     , m_repeatInterval(0)
     , m_cancellableTimerTask(nullptr)
     , m_webTaskRunner(webTaskRunner)
 #if DCHECK_IS_ON()
     , m_thread(currentThread())
 #endif
 {
     ASSERT(m_webTaskRunner);
@@ skipping 26 matching lines @@
 
 double TimerBase::nextFireInterval() const
 {
     ASSERT(isActive());
     double current = timerMonotonicallyIncreasingTime();
     if (m_nextFireTime < current)
         return 0;
     return m_nextFireTime - current;
 }
 
+// static
+WebTaskRunner* TimerBase::getTimerTaskRunner()
+{
+    return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
+}
+
+// static
+WebTaskRunner* TimerBase::getDefaultTaskRunner()

[haraken, 2016/07/28 14:44:46]

getDefaultTaskRunner => getUnthrottledTaskRunner ?

[Sami, 2016/07/28 16:38:55]

+1

[dcheng, 2016/07/29 02:23:18]

Done.

+{
+    return Platform::current()->currentThread()->getWebTaskRunner();
+}
+
 WebTaskRunner* TimerBase::timerTaskRunner() const
 {
     return m_webTaskRunner;
 }
 
 void TimerBase::setNextFireTime(double now, double delay)
 {
     ASSERT(m_thread == currentThread());
 
     double newTime = now + delay;
@@ skipping 35 matching lines @@
     fired();
     TRACE_EVENT_SET_SAMPLING_STATE("blink", "Sleeping");
 }
 
 bool TimerBase::Comparator::operator()(const TimerBase* a, const TimerBase* b) const
 {
     return a->m_nextFireTime < b->m_nextFireTime;
 }
 
 // static
-WebTaskRunner* TimerBase::UnthrottledWebTaskRunner()
-{
-    return Platform::current()->currentThread()->getWebTaskRunner();
-}
-
 double TimerBase::timerMonotonicallyIncreasingTime() const
 {
     return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();
 }
 
 } // namespace blink