Index: ui/compositor/layer_animator.h |
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h |
index 5fe0d5c189617d8434fee88cb7e20c0bf8cec99a..ad3754de158e8211a1c386c7be1f53464adaa58c 100644 |
--- a/ui/compositor/layer_animator.h |
+++ b/ui/compositor/layer_animator.h |
@@ -88,6 +88,10 @@ class COMPOSITOR_EXPORT LayerAnimator |
virtual void SetColor(SkColor color); |
SkColor GetTargetColor() const; |
+ // Returns the default length of animations, including adjustment for slow |
+ // animation mode if set. |
+ base::TimeDelta GetTransitionDuration() const; |
+ |
// Sets the layer animation delegate the animator is associated with. The |
// animator does not own the delegate. The layer animator expects a non-NULL |
// delegate for most of its operations, so do not call any methods without |
@@ -294,9 +298,8 @@ class COMPOSITOR_EXPORT LayerAnimator |
// starting the animation or adding to the queue. |
void OnScheduled(LayerAnimationSequence* sequence); |
- // Returns the default length of animations, including adjustment for slow |
- // animation mode if set. |
- base::TimeDelta GetTransitionDuration() const; |
+ // Sets |transition_duration_| unless |is_transition_duration_locked_| is set. |
+ void SetTransitionDuration(base::TimeDelta duration); |
// Clears the animation queues and notifies any running animations that they |
// have been aborted. |
@@ -317,6 +320,10 @@ class COMPOSITOR_EXPORT LayerAnimator |
// Determines how animations are replaced. |
PreemptionStrategy preemption_strategy_; |
+ // Whether the length of animations is locked. While it is locked |
+ // SetTransitionDuration does not set |transition_duration_|. |
+ bool is_transition_duration_locked_; |
+ |
// The default length of animations. |
base::TimeDelta transition_duration_; |