| Index: ui/compositor/scoped_layer_animation_settings.h
|
| diff --git a/ui/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h
|
| index e8a1b468ba6f94df2fb1baf1dbfd93704756c40b..e201024c5d22c3939e2934680da3b0dea153220a 100644
|
| --- a/ui/compositor/scoped_layer_animation_settings.h
|
| +++ b/ui/compositor/scoped_layer_animation_settings.h
|
| @@ -26,7 +26,7 @@ class InvertingObserver;
|
| // (200ms).
|
| class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
|
| public:
|
| - explicit ScopedLayerAnimationSettings(LayerAnimator* animator);
|
| + explicit ScopedLayerAnimationSettings(scoped_refptr<LayerAnimator> animator);
|
| virtual ~ScopedLayerAnimationSettings();
|
|
|
| void AddObserver(ImplicitAnimationObserver* observer);
|
| @@ -55,7 +55,7 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
|
| void AddInverselyAnimatedLayer(Layer* inverse_layer);
|
|
|
| private:
|
| - LayerAnimator* animator_;
|
| + scoped_refptr<LayerAnimator> animator_;
|
| bool old_is_transition_duration_locked_;
|
| base::TimeDelta old_transition_duration_;
|
| gfx::Tween::Type old_tween_type_;
|
|
|