Remove ui::LayerAnimationSequence::duration and ui::LayerAnimationElement::duration.

ui/compositor/layer_animation_element.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animation_element.h"
 
 #include "base/compiler_specific.h"
 #include "ui/base/animation/tween.h"
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_animator.h"
@@ skipping 387 matching lines @@
     base::TimeDelta duration)
     : first_frame_(true),
       properties_(properties),
       duration_(GetEffectiveDuration(duration)),
       tween_type_(Tween::LINEAR) {
 }
 
 LayerAnimationElement::~LayerAnimationElement() {
 }
 
-bool LayerAnimationElement::Progress(double t,
+bool LayerAnimationElement::Progress(base::TimeDelta elapsed,
                                      LayerAnimationDelegate* delegate) {
   if (first_frame_)
     OnStart(delegate);
+  double t = 1.0;
+  if ((duration_ > base::TimeDelta()) && (elapsed < duration_))
+    t = elapsed.InMillisecondsF() / duration_.InMillisecondsF();
   bool need_draw = OnProgress(Tween::CalculateValue(tween_type_, t), delegate);
   first_frame_ = t == 1.0;
   return need_draw;
 }
 
+bool LayerAnimationElement::IsFinished(base::TimeDelta elapsed,
+                                       base::TimeDelta* total_duration) {
+  if (elapsed >= duration_) {
+    *total_duration = duration_;
+    return true;
+  }
+  return false;
+}
+
+bool LayerAnimationElement::ProgressToEnd(LayerAnimationDelegate* delegate) {
+  return Progress(duration_, delegate);
+}
+
 void LayerAnimationElement::GetTargetValue(TargetValue* target) const {
   OnGetTarget(target);
 }
 
 void LayerAnimationElement::Abort() {
   first_frame_ = true;
   OnAbort();
 }
 
 // static
@@ skipping 66 matching lines @@
 }
 
 // static
 LayerAnimationElement* LayerAnimationElement::CreateColorElement(
     SkColor color,
     base::TimeDelta duration) {
   return new ColorTransition(color, duration);
 }
 
 }  // namespace ui