| 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 "cc/animation_curve.h" |
| 10 #include "TraceEvent.h" | 10 #include "TraceEvent.h" |
| 11 #ifdef LOG | 11 #ifdef LOG |
| 12 #undef LOG | 12 #undef LOG |
| 13 #endif | 13 #endif |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include <cmath> | 15 #include <cmath> |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // This should match the RunState enum. | 19 // This should match the RunState enum. |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 { | 203 { |
| 204 // Currently, we only push changes due to pausing and resuming animations on
the main thread. | 204 // Currently, we only push changes due to pausing and resuming animations on
the main thread. |
| 205 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive
Animation::Paused) { | 205 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive
Animation::Paused) { |
| 206 other->m_runState = m_runState; | 206 other->m_runState = m_runState; |
| 207 other->m_pauseTime = m_pauseTime; | 207 other->m_pauseTime = m_pauseTime; |
| 208 other->m_totalPausedTime = m_totalPausedTime; | 208 other->m_totalPausedTime = m_totalPausedTime; |
| 209 } | 209 } |
| 210 } | 210 } |
| 211 | 211 |
| 212 } // namespace cc | 212 } // namespace cc |
| OLD | NEW |