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/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" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 : curve_(curve.Pass()), | 60 : curve_(curve.Pass()), |
61 id_(animation_id), | 61 id_(animation_id), |
62 group_(group_id), | 62 group_(group_id), |
63 target_property_(target_property), | 63 target_property_(target_property), |
64 run_state_(WaitingForTargetAvailability), | 64 run_state_(WaitingForTargetAvailability), |
65 iterations_(1), | 65 iterations_(1), |
66 start_time_(0), | 66 start_time_(0), |
67 alternates_direction_(false), | 67 alternates_direction_(false), |
68 time_offset_(0), | 68 time_offset_(0), |
69 needs_synchronized_start_time_(false), | 69 needs_synchronized_start_time_(false), |
| 70 received_finished_event_(false), |
70 suspended_(false), | 71 suspended_(false), |
71 pause_time_(0), | 72 pause_time_(0), |
72 total_paused_time_(0), | 73 total_paused_time_(0), |
73 is_controlling_instance_(false), | 74 is_controlling_instance_(false), |
74 is_impl_only_(false) {} | 75 is_impl_only_(false) {} |
75 | 76 |
76 Animation::~Animation() { | 77 Animation::~Animation() { |
77 if (run_state_ == Running || run_state_ == Paused) | 78 if (run_state_ == Running || run_state_ == Paused) |
78 SetRunState(Aborted, 0); | 79 SetRunState(Aborted, 0); |
79 } | 80 } |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 // the main thread. | 229 // the main thread. |
229 if (run_state_ == Animation::Paused || | 230 if (run_state_ == Animation::Paused || |
230 other->run_state_ == Animation::Paused) { | 231 other->run_state_ == Animation::Paused) { |
231 other->run_state_ = run_state_; | 232 other->run_state_ = run_state_; |
232 other->pause_time_ = pause_time_; | 233 other->pause_time_ = pause_time_; |
233 other->total_paused_time_ = total_paused_time_; | 234 other->total_paused_time_ = total_paused_time_; |
234 } | 235 } |
235 } | 236 } |
236 | 237 |
237 } // namespace cc | 238 } // namespace cc |
OLD | NEW |