Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Side by Side Diff: cc/animation/animation.h

Issue 1151763011: Fix assumptions made in LAC::MarkAnimationsForDeletion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CC_ANIMATION_ANIMATION_H_ 5 #ifndef CC_ANIMATION_ANIMATION_H_
6 #define CC_ANIMATION_ANIMATION_H_ 6 #define CC_ANIMATION_ANIMATION_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 received_finished_event_ = received_finished_event; 144 received_finished_event_ = received_finished_event;
145 } 145 }
146 146
147 // Takes the given absolute time, and using the start time and the number 147 // Takes the given absolute time, and using the start time and the number
148 // of iterations, returns the relative time in the current iteration. 148 // of iterations, returns the relative time in the current iteration.
149 base::TimeDelta TrimTimeToCurrentIteration( 149 base::TimeDelta TrimTimeToCurrentIteration(
150 base::TimeTicks monotonic_time) const; 150 base::TimeTicks monotonic_time) const;
151 151
152 scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state) const; 152 scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state) const;
153 153
154 void set_is_controlling_instance_for_test(bool is_controlling_instance) {
155 is_controlling_instance_ = is_controlling_instance;
156 }
154 bool is_controlling_instance() const { return is_controlling_instance_; } 157 bool is_controlling_instance() const { return is_controlling_instance_; }
155 158
156 void PushPropertiesTo(Animation* other) const; 159 void PushPropertiesTo(Animation* other) const;
157 160
158 void set_is_impl_only(bool is_impl_only) { is_impl_only_ = is_impl_only; } 161 void set_is_impl_only(bool is_impl_only) { is_impl_only_ = is_impl_only; }
159 bool is_impl_only() const { return is_impl_only_; } 162 bool is_impl_only() const { return is_impl_only_; }
160 163
161 void set_affects_active_observers(bool affects_active_observers) { 164 void set_affects_active_observers(bool affects_active_observers) {
162 affects_active_observers_ = affects_active_observers; 165 affects_active_observers_ = affects_active_observers;
163 } 166 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 // longer affect any observers, and are deleted. 244 // longer affect any observers, and are deleted.
242 bool affects_active_observers_; 245 bool affects_active_observers_;
243 bool affects_pending_observers_; 246 bool affects_pending_observers_;
244 247
245 DISALLOW_COPY_AND_ASSIGN(Animation); 248 DISALLOW_COPY_AND_ASSIGN(Animation);
246 }; 249 };
247 250
248 } // namespace cc 251 } // namespace cc
249 252
250 #endif // CC_ANIMATION_ANIMATION_H_ 253 #endif // CC_ANIMATION_ANIMATION_H_
OLDNEW
« no previous file with comments | « no previous file | cc/animation/layer_animation_controller.cc » ('j') | cc/animation/layer_animation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698