ui::ThreadedOpacityTransition::OnAbort should depend on tween_type()

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 "cc/animation.h"
 #include "cc/animation_id_provider.h"
 #include "ui/base/animation/tween.h"
@@ skipping 426 matching lines @@
   virtual ~ThreadedOpacityTransition() {}
 
  protected:
   virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE {
     start_ = delegate->GetOpacityForAnimation();
   }
 
   virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {
     if (delegate && Started()) {
       ThreadedLayerAnimationElement::OnAbort(delegate);
-      delegate->SetOpacityFromAnimation(
-          Tween::ValueBetween(last_progressed_fraction(), start_, target_));
+      delegate->SetOpacityFromAnimation(Tween::ValueBetween(
+            Tween::CalculateValue(tween_type(), last_progressed_fraction()),
+            start_,
+            target_));
     }
   }
 
   virtual void OnEnd(LayerAnimationDelegate* delegate) OVERRIDE {
     delegate->SetOpacityFromAnimation(target_);
   }
 
   virtual scoped_ptr<cc::Animation> CreateCCAnimation() OVERRIDE {
     scoped_ptr<cc::AnimationCurve> animation_curve(
         new FloatAnimationCurveAdapter(tween_type(),
@@ skipping 234 matching lines @@
 }
 
 // static
 LayerAnimationElement* LayerAnimationElement::CreateColorElement(
     SkColor color,
     base::TimeDelta duration) {
   return new ColorTransition(color, duration);
 }
 
 }  // namespace ui