diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/platform/Timer.cpp | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/platform/Timer.cpp')
-rw-r--r-- | WebCore/platform/Timer.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/WebCore/platform/Timer.cpp b/WebCore/platform/Timer.cpp index bd29fd8..539846c 100644 --- a/WebCore/platform/Timer.cpp +++ b/WebCore/platform/Timer.cpp @@ -53,11 +53,6 @@ static Vector<TimerBase*>& timerHeap() return threadGlobalData().threadTimers().timerHeap(); } -static HashSet<const TimerBase*>& timersReadyToFire() -{ - return threadGlobalData().threadTimers().timersReadyToFire(); -} - // Class to represent elements in the heap when calling the standard library heap algorithms. // Maintains the m_heapIndex value in the timers themselves, which allows us to do efficient // modification of the heap. @@ -205,7 +200,7 @@ bool TimerBase::isActive() const { ASSERT(m_thread == currentThread()); - return m_nextFireTime || timersReadyToFire().contains(this); + return m_nextFireTime; } double TimerBase::nextFireInterval() const @@ -296,9 +291,6 @@ void TimerBase::setNextFireTime(double newTime) ASSERT(m_thread == currentThread()); // Keep heap valid while changing the next-fire time. - - timersReadyToFire().remove(this); - double oldTime = m_nextFireTime; if (oldTime != newTime) { m_nextFireTime = newTime; |