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 "cc/animation.h" | 5 #include "cc/animation/animation.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
11 #include "cc/animation_curve.h" | 11 #include "cc/animation/animation_curve.h" |
12 | 12 |
13 namespace { | 13 namespace { |
14 | 14 |
15 // This should match the RunState enum. | 15 // This should match the RunState enum. |
16 static const char* const s_runStateNames[] = { | 16 static const char* const s_runStateNames[] = { |
17 "WaitingForNextTick", | 17 "WaitingForNextTick", |
18 "WaitingForTargetAvailability", | 18 "WaitingForTargetAvailability", |
19 "WaitingForStartTime", | 19 "WaitingForStartTime", |
20 "WaitingForDeletion", | 20 "WaitingForDeletion", |
21 "Starting", | 21 "Starting", |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 // the main thread. | 227 // the main thread. |
228 if (run_state_ == Animation::Paused || | 228 if (run_state_ == Animation::Paused || |
229 other->run_state_ == Animation::Paused) { | 229 other->run_state_ == Animation::Paused) { |
230 other->run_state_ = run_state_; | 230 other->run_state_ = run_state_; |
231 other->pause_time_ = pause_time_; | 231 other->pause_time_ = pause_time_; |
232 other->total_paused_time_ = total_paused_time_; | 232 other->total_paused_time_ = total_paused_time_; |
233 } | 233 } |
234 } | 234 } |
235 | 235 |
236 } // namespace cc | 236 } // namespace cc |
OLD | NEW |