| Index: ui/gfx/compositor/scoped_layer_animation_settings.cc
|
| diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.cc b/ui/gfx/compositor/scoped_layer_animation_settings.cc
|
| index 7a7dbc14aab28a9175d3eac679b61ebbae5c8539..0b1221b3aa315243b68c9ab8dbe9f6f93799d2c8 100644
|
| --- a/ui/gfx/compositor/scoped_layer_animation_settings.cc
|
| +++ b/ui/gfx/compositor/scoped_layer_animation_settings.cc
|
| @@ -19,12 +19,14 @@ namespace ui {
|
| ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
|
| LayerAnimator* animator)
|
| : animator_(animator),
|
| - old_transition_duration_(animator->transition_duration_) {
|
| + old_transition_duration_(animator->transition_duration_),
|
| + old_preemption_strategy_(animator->preemption_strategy_) {
|
| SetTransitionDuration(kDefaultTransitionDuration);
|
| }
|
|
|
| ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings() {
|
| animator_->transition_duration_ = old_transition_duration_;
|
| + animator_->preemption_strategy_ = old_preemption_strategy_;
|
|
|
| for (std::set<ImplicitAnimationObserver*>::const_iterator i =
|
| observers_.begin(); i != observers_.end(); ++i) {
|
| @@ -44,5 +46,10 @@ void ScopedLayerAnimationSettings::SetTransitionDuration(
|
| animator_->transition_duration_ = duration;
|
| }
|
|
|
| +void ScopedLayerAnimationSettings::SetPreemptionStrategy(
|
| + LayerAnimator::PreemptionStrategy strategy) {
|
| + animator_->preemption_strategy_ = strategy;
|
| +}
|
| +
|
| } // namespace ui
|
|
|
|
|