Revert of Implement timers by posting delayed tasks

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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Timer_h
 #define Timer_h
 
 #include "platform/PlatformExport.h"
 #include "platform/heap/Handle.h"
-#include "platform/scheduler/CancellableTaskFactory.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/AddressSanitizer.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 // Time intervals are all in seconds.
 
@@ skipping 17 matching lines @@
     void stop();
     bool isActive() const;
     const WebTraceLocation& location() const { return m_location; }
 
     double nextFireInterval() const;
     double nextUnalignedFireInterval() const;
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     double repeatInterval() const { return m_repeatInterval; }
 
     void augmentRepeatInterval(double delta) {
-        double now = monotonicallyIncreasingTime();
-        setNextFireTime(now, m_nextFireTime - now + delta);
+        setNextFireTime(m_nextFireTime + delta);
         m_repeatInterval += delta;
     }
 
-    void didChangeAlignmentInterval(double now);
+    void didChangeAlignmentInterval();
 
 private:
     virtual void fired() = 0;
 
     NO_LAZY_SWEEP_SANITIZE_ADDRESS
     virtual double alignedFireTime(double fireTime) const { return fireTime; }
 
-    void setNextFireTime(double now, double delay);
+    void checkConsistency() const;
+    void checkHeapIndex() const;
 
-    void run();
+    void setNextFireTime(double);
+
+    NO_LAZY_SWEEP_SANITIZE_ADDRESS
+    bool inHeap() const { return m_heapIndex != -1; }
+
+    bool hasValidHeapPosition() const;
+    void updateHeapIfNeeded(double oldTime);
+
+    void heapDecreaseKey();
+    void heapDelete();
+    void heapDeleteMin();
+    void heapIncreaseKey();
+    void heapInsert();
+    void heapPop();
+    void heapPopMin();
+
+    NO_LAZY_SWEEP_SANITIZE_ADDRESS
+    Vector<TimerBase*>& timerHeap() const { ASSERT(m_cachedThreadGlobalTimerHeap); return *m_cachedThreadGlobalTimerHeap; }
 
     double m_nextFireTime; // 0 if inactive
     double m_unalignedNextFireTime; // m_nextFireTime not considering alignment interval
     double m_repeatInterval; // 0 if not repeating
+    int m_heapIndex; // -1 if not in heap
+    unsigned m_heapInsertionOrder; // Used to keep order among equal-fire-time timers
+    Vector<TimerBase*>* m_cachedThreadGlobalTimerHeap;
     WebTraceLocation m_location;
-    CancellableTaskFactory m_cancellableTaskFactory;
-    WebScheduler* m_webScheduler; // Not owned.
 
 #if ENABLE(ASSERT)
     ThreadIdentifier m_thread;
 #endif
 
     friend class ThreadTimers;
     friend class TimerHeapLessThanFunction;
     friend class TimerHeapReference;
 };
 
@@ skipping 38 matching lines @@
     // in the current code base).
     GC_PLUGIN_IGNORE("363031")
     TimerFiredClass* m_object;
     TimerFiredFunction m_function;
 };
 
 NO_LAZY_SWEEP_SANITIZE_ADDRESS
 inline bool TimerBase::isActive() const
 {
     ASSERT(m_thread == currentThread());
-    return m_cancellableTaskFactory.isPending();
+    return m_nextFireTime;
 }
 
 }
 
 #endif