Chromium Code Reviews| Index: cc/animation/layer_animation_controller.h |
| diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h |
| index 73c7d7690ce4d6abf900af50a523ba2d8a4d2f6d..701b67e6bf3187d4cc0e8cbdf371dd0242114874 100644 |
| --- a/cc/animation/layer_animation_controller.h |
| +++ b/cc/animation/layer_animation_controller.h |
| @@ -101,8 +101,23 @@ class CC_EXPORT LayerAnimationController |
| void NotifyAnimationPropertyUpdate(const AnimationEvent& event); |
| void NotifyAnimationTakeover(const AnimationEvent& event); |
| - void AddValueObserver(LayerAnimationValueObserver* observer); |
| - void RemoveValueObserver(LayerAnimationValueObserver* observer); |
| + void SetValueObserver(LayerAnimationValueObserver* observer) { |
|
ajuma
2016/04/14 14:01:18
Nit: set_value_observer
loyso (OOO)
2016/04/15 03:32:21
I can make it out-of-line to comply with the namin
loyso (OOO)
2016/04/15 03:53:27
Done.
|
| + value_observer_ = observer; |
| + } |
| + |
| + bool needs_active_value_observations() const { |
| + return needs_active_value_observations_; |
| + } |
| + bool needs_pending_value_observations() const { |
| + return needs_pending_value_observations_; |
| + } |
| + |
| + void SetNeedsActiveValueObservations(bool needs_active_value_observations) { |
|
ajuma
2016/04/14 14:01:17
set_needs_active_value_observations
loyso (OOO)
2016/04/15 03:53:27
Done.
|
| + needs_active_value_observations_ = needs_active_value_observations; |
| + } |
| + void SetNeedsPendingValueObservations(bool needs_pending_value_observations) { |
|
ajuma
2016/04/14 14:01:17
set_needs_pending_value_observations
loyso (OOO)
2016/04/15 03:53:26
Done.
|
| + needs_pending_value_observations_ = needs_pending_value_observations; |
| + } |
| void AddEventObserver(LayerAnimationEventObserver* observer); |
| void RemoveEventObserver(LayerAnimationEventObserver* observer); |
| @@ -235,13 +250,14 @@ class CC_EXPORT LayerAnimationController |
| base::TimeTicks last_tick_time_; |
| - base::ObserverList<LayerAnimationValueObserver> value_observers_; |
| base::ObserverList<LayerAnimationEventObserver> event_observers_; |
| - |
| + LayerAnimationValueObserver* value_observer_; |
| LayerAnimationValueProvider* value_provider_; |
| - |
| AnimationDelegate* layer_animation_delegate_; |
| + bool needs_active_value_observations_; |
| + bool needs_pending_value_observations_; |
| + |
| // Only try to start animations when new animations are added or when the |
| // previous attempt at starting animations failed to start all animations. |
| bool needs_to_start_animations_; |