WIP - not ready for review

Source/platform/ThreadTimers.h

 /*
  * Copyright (C) 2006 Apple Computer, 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 10 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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 ThreadTimers_h
 #define ThreadTimers_h
 
 #include "platform/PlatformExport.h"
+#include "platform/TimerHeap.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/HashSet.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class SharedTimer;
 class TimerBase;
 
 // A collection of timers per thread. Kept in PlatformThreadData.
-class PLATFORM_EXPORT ThreadTimers {
+class PLATFORM_EXPORT ThreadTimers : public TimerQueueObserver {
     WTF_MAKE_NONCOPYABLE(ThreadTimers); WTF_MAKE_FAST_ALLOCATED;
 public:
     ThreadTimers();
 
     // On a thread different then main, we should set the thread's instance of the SharedTimer.
     void setSharedTimer(SharedTimer*);
 
-    Vector<TimerBase*>& timerHeap() { return m_timerHeap; }
+    TimerHeap& timerHeap() { return m_timerHeap; }
 
     void updateSharedTimer();
     void fireTimersInNestedEventLoop();
 
 private:
     static void sharedTimerFired();
 
+    // TimerQueueObserver
+    virtual void nextFiringTimerChanged() override;
+
     void sharedTimerFiredInternal();
     void fireTimersInNestedEventLoopInternal();
 
-    Vector<TimerBase*> m_timerHeap;
+    TimerHeap m_timerHeap;
     SharedTimer* m_sharedTimer; // External object, can be a run loop on a worker thread. Normally set/reset by worker thread.
     bool m_firingTimers; // Reentrancy guard.
     double m_pendingSharedTimerFireTime;
 };
 
 }
 
 #endif