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 "cc/active_animation.h" |
8 | 8 |
9 #include "CCAnimationCurve.h" | 9 #include <cmath> |
| 10 |
10 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
11 #include "base/string_util.h" | 12 #include "base/string_util.h" |
12 #include <cmath> | 13 #include "cc/animation_curve.h" |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 // This should match the RunState enum. | 17 // This should match the RunState enum. |
17 static const char* const s_runStateNames[] = { | 18 static const char* const s_runStateNames[] = { |
18 "WaitingForNextTick", | 19 "WaitingForNextTick", |
19 "WaitingForTargetAvailability", | 20 "WaitingForTargetAvailability", |
20 "WaitingForStartTime", | 21 "WaitingForStartTime", |
21 "WaitingForDeletion", | 22 "WaitingForDeletion", |
22 "Running", | 23 "Running", |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 { | 201 { |
201 // Currently, we only push changes due to pausing and resuming animations on
the main thread. | 202 // Currently, we only push changes due to pausing and resuming animations on
the main thread. |
202 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim
ation::Paused) { | 203 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim
ation::Paused) { |
203 other->m_runState = m_runState; | 204 other->m_runState = m_runState; |
204 other->m_pauseTime = m_pauseTime; | 205 other->m_pauseTime = m_pauseTime; |
205 other->m_totalPausedTime = m_totalPausedTime; | 206 other->m_totalPausedTime = m_totalPausedTime; |
206 } | 207 } |
207 } | 208 } |
208 | 209 |
209 } // namespace cc | 210 } // namespace cc |
OLD | NEW |