Reland r107720 - Enable the new layer animation framework.

ui/gfx/compositor/layer_animation_element_unittest.cc

 // Copyright (c) 2011 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/gfx/compositor/layer_animation_element.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
+#include "ui/gfx/compositor/dummy_layer_animation_delegate.h"
 #include "ui/gfx/compositor/layer_animation_delegate.h"
 #include "ui/gfx/compositor/test_utils.h"
-#include "ui/gfx/compositor/test_layer_animation_delegate.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;
+  DummyLayerAnimationDelegate delegate;
   Transform start_transform, target_transform, middle_transform;
   start_transform.SetRotate(-90);
   target_transform.SetRotate(90);
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateTransformElement(target_transform, delta));
 
   for (int i = 0; i < 2; ++i) {
     delegate.SetTransformFromAnimation(start_transform);
     element->Progress(0.0, &delegate);
     CheckApproximatelyEqual(start_transform,
                             delegate.GetTransformForAnimation());
     element->Progress(0.5, &delegate);
     CheckApproximatelyEqual(middle_transform,
                             delegate.GetTransformForAnimation());
     element->Progress(1.0, &delegate);
     CheckApproximatelyEqual(target_transform,
                             delegate.GetTransformForAnimation());
   }
 
+  LayerAnimationElement::TargetValue target_value;
+  element->GetTargetValue(&target_value);
+  CheckApproximatelyEqual(target_transform, target_value.transform);
+
   EXPECT_EQ(delta, 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;
+  DummyLayerAnimationDelegate delegate;
   gfx::Rect start, target, middle;
   start = target = middle = gfx::Rect(0, 0, 50, 50);
   start.set_x(-90);
   target.set_x(90);
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateBoundsElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     delegate.SetBoundsFromAnimation(start);
     element->Progress(0.0, &delegate);
     CheckApproximatelyEqual(start, delegate.GetBoundsForAnimation());
     element->Progress(0.5, &delegate);
     CheckApproximatelyEqual(middle, delegate.GetBoundsForAnimation());
     element->Progress(1.0, &delegate);
     CheckApproximatelyEqual(target, delegate.GetBoundsForAnimation());
   }
 
+  LayerAnimationElement::TargetValue target_value;
+  element->GetTargetValue(&target_value);
+  CheckApproximatelyEqual(target, target_value.bounds);
+
   EXPECT_EQ(delta, element->duration());
 }
 
 // Check that the opacity element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, OpacityElement) {
-  TestLayerAnimationDelegate delegate;
+  DummyLayerAnimationDelegate delegate;
   float start = 0.0;
   float middle = 0.5;
   float target = 1.0;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateOpacityElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     delegate.SetOpacityFromAnimation(start);
     element->Progress(0.0, &delegate);
     EXPECT_FLOAT_EQ(start, delegate.GetOpacityForAnimation());
     element->Progress(0.5, &delegate);
     EXPECT_FLOAT_EQ(middle, delegate.GetOpacityForAnimation());
     element->Progress(1.0, &delegate);
     EXPECT_FLOAT_EQ(target, delegate.GetOpacityForAnimation());
   }
 
+  LayerAnimationElement::TargetValue target_value;
+  element->GetTargetValue(&target_value);
+  EXPECT_FLOAT_EQ(target, target_value.opacity);
+
   EXPECT_EQ(delta, element->duration());
 }
 
 // Check that the pause element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, PauseElement) {
   LayerAnimationElement::AnimatableProperties properties;
   properties.insert(LayerAnimationElement::TRANSFORM);
   properties.insert(LayerAnimationElement::BOUNDS);
   properties.insert(LayerAnimationElement::OPACITY);
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreatePauseElement(properties, delta));
 
-  TestLayerAnimationDelegate delegate;
-  TestLayerAnimationDelegate copy = delegate;
+  DummyLayerAnimationDelegate delegate;
+  DummyLayerAnimationDelegate copy = delegate;
 
   element->Progress(1.0, &delegate);
 
   // Nothing should have changed.
   CheckApproximatelyEqual(delegate.GetBoundsForAnimation(),
                           copy.GetBoundsForAnimation());
   CheckApproximatelyEqual(delegate.GetTransformForAnimation(),
                           copy.GetTransformForAnimation());
   EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(),
                   copy.GetOpacityForAnimation());
 
   // Pause should last for |delta|.
   EXPECT_EQ(delta, element->duration());
 }
 
 } // namespace
 
 } // namespace ui