| 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 "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 void ActiveAnimation::pushPropertiesTo(ActiveAnimation* other) const | 200 void ActiveAnimation::pushPropertiesTo(ActiveAnimation* other) const |
| 201 { | 201 { |
| 202 // 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. |
| 203 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim
ation::Paused) { | 203 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim
ation::Paused) { |
| 204 other->m_runState = m_runState; | 204 other->m_runState = m_runState; |
| 205 other->m_pauseTime = m_pauseTime; | 205 other->m_pauseTime = m_pauseTime; |
| 206 other->m_totalPausedTime = m_totalPausedTime; | 206 other->m_totalPausedTime = m_totalPausedTime; |
| 207 } | 207 } |
| 208 } | 208 } |
| 209 | 209 |
| 210 } // namespace cc | 210 } // namespace cc |
| OLD | NEW |