| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "CCTimer.h" | 7 #include "CCTimer.h" |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" |
| 10 #include "CCThread.h" | 11 #include "CCThread.h" |
| 11 | 12 |
| 12 namespace cc { | 13 namespace cc { |
| 13 | 14 |
| 14 class CCTimerTask : public CCThread::Task { | 15 class CCTimerTask : public CCThread::Task { |
| 15 public: | 16 public: |
| 16 explicit CCTimerTask(CCTimer* timer) | 17 explicit CCTimerTask(CCTimer* timer) |
| 17 : CCThread::Task(0) | 18 : CCThread::Task(0) |
| 18 , m_timer(timer) | 19 , m_timer(timer) |
| 19 { | 20 { |
| 20 } | 21 } |
| 21 | 22 |
| 22 virtual ~CCTimerTask() | 23 virtual ~CCTimerTask() |
| 23 { | 24 { |
| 24 if (!m_timer) | 25 if (!m_timer) |
| 25 return; | 26 return; |
| 26 | 27 |
| 27 ASSERT(m_timer->m_task == this); | 28 DCHECK(m_timer->m_task == this); |
| 28 m_timer->stop(); | 29 m_timer->stop(); |
| 29 } | 30 } |
| 30 | 31 |
| 31 virtual void performTask() OVERRIDE | 32 virtual void performTask() OVERRIDE |
| 32 { | 33 { |
| 33 if (!m_timer) | 34 if (!m_timer) |
| 34 return; | 35 return; |
| 35 | 36 |
| 36 CCTimerClient* client = m_timer->m_client; | 37 CCTimerClient* client = m_timer->m_client; |
| 37 | 38 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 void CCTimer::stop() | 72 void CCTimer::stop() |
| 72 { | 73 { |
| 73 if (!m_task) | 74 if (!m_task) |
| 74 return; | 75 return; |
| 75 | 76 |
| 76 m_task->m_timer = 0; | 77 m_task->m_timer = 0; |
| 77 m_task = 0; | 78 m_task = 0; |
| 78 } | 79 } |
| 79 | 80 |
| 80 } // namespace cc | 81 } // namespace cc |
| OLD | NEW |