| Index: ui/gfx/compositor/scoped_layer_animation_settings.h
|
| diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.h b/ui/gfx/compositor/scoped_layer_animation_settings.h
|
| index dce64ef4a6430250539d33addbf964f3f42d02b4..44a2f8b5d951b225c04ccc4963e7fef7f56c4cee 100644
|
| --- a/ui/gfx/compositor/scoped_layer_animation_settings.h
|
| +++ b/ui/gfx/compositor/scoped_layer_animation_settings.h
|
| @@ -11,11 +11,11 @@
|
| #include "base/time.h"
|
|
|
| #include "ui/gfx/compositor/compositor_export.h"
|
| +#include "ui/gfx/compositor/layer_animator.h"
|
|
|
| namespace ui {
|
|
|
| class ImplicitAnimationObserver;
|
| -class LayerAnimator;
|
| class LayerAnimationObserver;
|
|
|
| // Scoped settings allow you to temporarily change the animator's settings and
|
| @@ -29,10 +29,12 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
|
|
|
| void AddObserver(ImplicitAnimationObserver* observer);
|
| void SetTransitionDuration(base::TimeDelta duration);
|
| + void SetPreemptionStrategy(LayerAnimator::PreemptionStrategy strategy);
|
|
|
| private:
|
| LayerAnimator* animator_;
|
| base::TimeDelta old_transition_duration_;
|
| + LayerAnimator::PreemptionStrategy old_preemption_strategy_;
|
| std::set<ImplicitAnimationObserver*> observers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings);
|
|
|