Chromium Code Reviews| Index: Source/core/frame/SuspendableTimer.cpp |
| diff --git a/Source/core/frame/SuspendableTimer.cpp b/Source/core/frame/SuspendableTimer.cpp |
| index 64f082928ced7822dc69e77401c7c0d37b002ea7..be2d37290f0d42c868a0057307e5ec028484607b 100644 |
| --- a/Source/core/frame/SuspendableTimer.cpp |
| +++ b/Source/core/frame/SuspendableTimer.cpp |
| @@ -33,7 +33,6 @@ SuspendableTimer::SuspendableTimer(ExecutionContext* context) |
| : ActiveDOMObject(context) |
| , m_nextFireInterval(0) |
| , m_repeatInterval(0) |
| - , m_active(false) |
| #if ENABLE(ASSERT) |
| , m_suspended(false) |
| #endif |
| @@ -51,6 +50,7 @@ bool SuspendableTimer::hasPendingActivity() const |
| void SuspendableTimer::stop() |
| { |
| + m_nextFireInterval = 0; |
| TimerBase::stop(); |
| } |
| @@ -60,8 +60,7 @@ void SuspendableTimer::suspend() |
| ASSERT(!m_suspended); |
| m_suspended = true; |
| #endif |
| - m_active = isActive(); |
| - if (m_active) { |
| + if (isActive()) { |
| m_nextFireInterval = nextUnalignedFireInterval(); |
| m_repeatInterval = repeatInterval(); |
| TimerBase::stop(); |
| @@ -74,9 +73,11 @@ void SuspendableTimer::resume() |
| ASSERT(m_suspended); |
| m_suspended = false; |
| #endif |
| - // FIXME: FROM_HERE is wrong here. |
| - if (m_active) |
| - start(m_nextFireInterval, m_repeatInterval, FROM_HERE); |
| + if (m_nextFireInterval) { |
| + // start() was called before, therefore location() is already set. |
|
Mike West
2014/10/04 16:58:49
Hrm. It looks like it's safe to use m_nextFireInte
|
| + start(m_nextFireInterval, m_repeatInterval, location()); |
| + m_nextFireInterval = 0; |
| + } |
| } |
| } // namespace blink |