Index: ui/compositor/layer_animator.cc |
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc |
index 0454152ef4a11482a01961d1f1c8e7350902e244..f878897a86def98e710212dc7e912894557bcb78 100644 |
--- a/ui/compositor/layer_animator.cc |
+++ b/ui/compositor/layer_animator.cc |
@@ -55,7 +55,6 @@ gfx::AnimationContainer* GetAnimationContainer() { |
LayerAnimator::LayerAnimator(base::TimeDelta transition_duration) |
: delegate_(NULL), |
preemption_strategy_(IMMEDIATELY_SET_NEW_TARGET), |
- is_transition_duration_locked_(false), |
transition_duration_(transition_duration), |
tween_type_(gfx::Tween::LINEAR), |
is_started_(false), |
@@ -119,10 +118,6 @@ ANIMATED_PROPERTY(float, BRIGHTNESS, Brightness, float, brightness); |
ANIMATED_PROPERTY(float, GRAYSCALE, Grayscale, float, grayscale); |
ANIMATED_PROPERTY(SkColor, COLOR, Color, SkColor, color); |
-base::TimeDelta LayerAnimator::GetTransitionDuration() const { |
- return transition_duration_; |
-} |
- |
void LayerAnimator::SetDelegate(LayerAnimationDelegate* delegate) { |
delegate_ = delegate; |
} |
@@ -803,10 +798,8 @@ void LayerAnimator::OnScheduled(LayerAnimationSequence* sequence) { |
sequence->OnScheduled(); |
} |
-void LayerAnimator::SetTransitionDuration(base::TimeDelta duration) { |
- if (is_transition_duration_locked_) |
- return; |
- transition_duration_ = duration; |
+base::TimeDelta LayerAnimator::GetTransitionDuration() const { |
+ return transition_duration_; |
} |
void LayerAnimator::ClearAnimationsInternal() { |