| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "CCActiveAnimation.h" | 7 #include "CCActiveAnimation.h" |
| 8 | 8 |
| 9 #include "CCAnimationCurve.h" | 9 #include "CCAnimationCurve.h" |
| 10 #include "TraceEvent.h" | 10 #include "TraceEvent.h" |
| 11 #include <cmath> | 11 #include <cmath> |
| 12 #include <wtf/Assertions.h> | 12 #include <wtf/Assertions.h> |
| 13 #include <wtf/StdLibExtras.h> | 13 #include <wtf/StdLibExtras.h> |
| 14 #include <wtf/StringExtras.h> | |
| 15 | 14 |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 // This should match the RunState enum. | 17 // This should match the RunState enum. |
| 19 static const char* const s_runStateNames[] = { | 18 static const char* const s_runStateNames[] = { |
| 20 "WaitingForNextTick", | 19 "WaitingForNextTick", |
| 21 "WaitingForTargetAvailability", | 20 "WaitingForTargetAvailability", |
| 22 "WaitingForStartTime", | 21 "WaitingForStartTime", |
| 23 "WaitingForDeletion", | 22 "WaitingForDeletion", |
| 24 "Running", | 23 "Running", |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 { | 197 { |
| 199 // Currently, we only push changes due to pausing and resuming animations on
the main thread. | 198 // Currently, we only push changes due to pausing and resuming animations on
the main thread. |
| 200 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive
Animation::Paused) { | 199 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive
Animation::Paused) { |
| 201 other->m_runState = m_runState; | 200 other->m_runState = m_runState; |
| 202 other->m_pauseTime = m_pauseTime; | 201 other->m_pauseTime = m_pauseTime; |
| 203 other->m_totalPausedTime = m_totalPausedTime; | 202 other->m_totalPausedTime = m_totalPausedTime; |
| 204 } | 203 } |
| 205 } | 204 } |
| 206 | 205 |
| 207 } // namespace WebCore | 206 } // namespace WebCore |
| OLD | NEW |