Revert 220479 "Add support for inverse transform animations."

trunk/src/ui/compositor/layer_animation_element_unittest.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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/layer_animation_delegate.h"
-#include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/test_layer_animation_delegate.h"
 #include "ui/compositor/test/test_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 
 namespace {
 
 // Check that the transformation element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, TransformElement) {
   TestLayerAnimationDelegate delegate;
-  gfx::Transform start_transform, target_transform;
+  gfx::Transform start_transform, target_transform, middle_transform;
   start_transform.Rotate(-30.0);
   target_transform.Rotate(30.0);
   base::TimeTicks start_time;
   base::TimeTicks effective_start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateTransformElement(target_transform, delta));
   element->set_animation_group_id(1);
 
@@ skipping 21 matching lines @@
     EXPECT_FLOAT_EQ(1.0, element->last_progressed_fraction());
     CheckApproximatelyEqual(target_transform,
                             delegate.GetTransformForAnimation());
   }
 
   LayerAnimationElement::TargetValue target_value(&delegate);
   element->GetTargetValue(&target_value);
   CheckApproximatelyEqual(target_transform, target_value.transform);
 }
 
-// Ensures that duration is copied correctly.
-TEST(LayerAnimationElementTest, InverseElementDurationNoScale) {
-  gfx::Transform transform;
-  base::TimeDelta delta;
-
-  scoped_ptr<LayerAnimationElement> base_element(
-      LayerAnimationElement::CreateTransformElement(transform, delta));
-
-  scoped_ptr<LayerAnimationElement> inverse_element(
-      LayerAnimationElement::CreateInverseTransformElement(transform,
-                                                           base_element.get()));
-  EXPECT_EQ(base_element->duration(), inverse_element->duration());
-}
-
-// Ensures that duration is copied correctly and not double scaled.
-TEST(LayerAnimationElementTest, InverseElementDurationScaled) {
-  gfx::Transform transform;
-  base::TimeDelta delta;
-
-  ScopedAnimationDurationScaleMode faster_duration(
-      ScopedAnimationDurationScaleMode::FAST_DURATION);
-  scoped_ptr<LayerAnimationElement> base_element(
-      LayerAnimationElement::CreateTransformElement(transform, delta));
-
-  scoped_ptr<LayerAnimationElement> inverse_element(
-      LayerAnimationElement::CreateInverseTransformElement(transform,
-                                                           base_element.get()));
-  EXPECT_EQ(base_element->duration(), inverse_element->duration());
-}
-
 // Check that the bounds element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, BoundsElement) {
   TestLayerAnimationDelegate delegate;
   gfx::Rect start, target, middle;
   start = target = middle = gfx::Rect(0, 0, 50, 50);
   start.set_x(-90);
   target.set_x(90);
   base::TimeTicks start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
@@ skipping 287 matching lines @@
   element->Abort(&delegate);
   target_transform.Blend(start_transform,
                          Tween::CalculateValue(tween_type, 0.5));
   CheckApproximatelyEqual(target_transform,
                           delegate.GetTransformForAnimation());
 }
 
 } // namespace
 
 } // namespace ui