| Index: ui/compositor/layer_animator.h
|
| diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
|
| index 74995eeff0b193c92459e46b4c8af12b965273e9..2895842ae88d47a76826dd735d4d181e3eb11552 100644
|
| --- a/ui/compositor/layer_animator.h
|
| +++ b/ui/compositor/layer_animator.h
|
| @@ -117,9 +117,9 @@ class COMPOSITOR_EXPORT LayerAnimator
|
| void SwitchToLayer(scoped_refptr<cc::Layer> new_layer);
|
|
|
| // Attach AnimationPlayer to Layer and AnimationTimeline
|
| - void SetCompositor(Compositor* compositor);
|
| + void AttachLayerAndTimeline(Compositor* compositor);
|
| // Detach AnimationPlayer from Layer and AnimationTimeline
|
| - void ResetCompositor(Compositor* compositor);
|
| + void DetachLayerAndTimeline(Compositor* compositor);
|
|
|
| cc::AnimationPlayer* GetAnimationPlayerForTesting() const;
|
|
|
| @@ -406,11 +406,6 @@ class COMPOSITOR_EXPORT LayerAnimator
|
| // aborted.
|
| base::ObserverList<LayerAnimationObserver> observers_;
|
|
|
| - // We store a state of ElementAnimations here to save it in
|
| - // ResetCompositor/SetCompositor scope.
|
| - // TODO(loyso): Remove it. crbug.com/592873.
|
| - scoped_refptr<cc::ElementAnimations> element_animations_state_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
|
| };
|
|
|
|
|