Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/frame/SuspendableTimer.h" | 28 #include "core/frame/SuspendableTimer.h" |
| 29 | 29 |
| 30 namespace blink { | 30 namespace blink { |
| 31 | 31 |
| 32 SuspendableTimer::SuspendableTimer(ExecutionContext* context) | 32 SuspendableTimer::SuspendableTimer(ExecutionContext* context) |
| 33 : ActiveDOMObject(context) | 33 : ActiveDOMObject(context) |
| 34 , m_nextFireInterval(0) | 34 , m_nextFireInterval(0) |
| 35 , m_repeatInterval(0) | 35 , m_repeatInterval(0) |
| 36 , m_active(false) | |
| 37 #if ENABLE(ASSERT) | 36 #if ENABLE(ASSERT) |
| 38 , m_suspended(false) | 37 , m_suspended(false) |
| 39 #endif | 38 #endif |
| 40 { | 39 { |
| 41 } | 40 } |
| 42 | 41 |
| 43 SuspendableTimer::~SuspendableTimer() | 42 SuspendableTimer::~SuspendableTimer() |
| 44 { | 43 { |
| 45 } | 44 } |
| 46 | 45 |
| 47 bool SuspendableTimer::hasPendingActivity() const | 46 bool SuspendableTimer::hasPendingActivity() const |
| 48 { | 47 { |
| 49 return isActive(); | 48 return isActive(); |
| 50 } | 49 } |
| 51 | 50 |
| 52 void SuspendableTimer::stop() | 51 void SuspendableTimer::stop() |
| 53 { | 52 { |
| 53 m_nextFireInterval = 0; | |
| 54 TimerBase::stop(); | 54 TimerBase::stop(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 void SuspendableTimer::suspend() | 57 void SuspendableTimer::suspend() |
| 58 { | 58 { |
| 59 #if ENABLE(ASSERT) | 59 #if ENABLE(ASSERT) |
| 60 ASSERT(!m_suspended); | 60 ASSERT(!m_suspended); |
| 61 m_suspended = true; | 61 m_suspended = true; |
| 62 #endif | 62 #endif |
| 63 m_active = isActive(); | 63 if (isActive()) { |
| 64 if (m_active) { | |
| 65 m_nextFireInterval = nextUnalignedFireInterval(); | 64 m_nextFireInterval = nextUnalignedFireInterval(); |
| 66 m_repeatInterval = repeatInterval(); | 65 m_repeatInterval = repeatInterval(); |
| 67 TimerBase::stop(); | 66 TimerBase::stop(); |
| 68 } | 67 } |
| 69 } | 68 } |
| 70 | 69 |
| 71 void SuspendableTimer::resume() | 70 void SuspendableTimer::resume() |
| 72 { | 71 { |
| 73 #if ENABLE(ASSERT) | 72 #if ENABLE(ASSERT) |
| 74 ASSERT(m_suspended); | 73 ASSERT(m_suspended); |
| 75 m_suspended = false; | 74 m_suspended = false; |
| 76 #endif | 75 #endif |
| 77 // FIXME: FROM_HERE is wrong here. | 76 if (m_nextFireInterval) { |
| 78 if (m_active) | 77 // 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
| |
| 79 start(m_nextFireInterval, m_repeatInterval, FROM_HERE); | 78 start(m_nextFireInterval, m_repeatInterval, location()); |
| 79 m_nextFireInterval = 0; | |
| 80 } | |
| 80 } | 81 } |
| 81 | 82 |
| 82 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |