Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: ui/gfx/compositor/scoped_layer_animation_settings.cc

Issue 9388018: Compact layout mananger animates windows rather than the default container layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« ash/wm/compact_layout_manager.cc ('K') | « ui/gfx/compositor/scoped_layer_animation_settings.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698