gfx: Add FrameTime and DisplayTime classes

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/frame_time.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;
   start_transform.Rotate(-30.0);
   target_transform.Rotate(30.0);
-  base::TimeTicks start_time;
-  base::TimeTicks effective_start_time;
+  gfx::FrameTime start_time;
+  gfx::FrameTime 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);
 
   for (int i = 0; i < 2; ++i) {
     start_time = effective_start_time + delta;
     element->set_requested_start_time(start_time);
     delegate.SetTransformFromAnimation(start_transform);
@@ skipping 49 matching lines @@
       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 the GetTargetTransform() method works as intended.
 TEST(LayerAnimationElementTest, InverseElementTargetCalculation) {
-  base::TimeTicks start_time;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   start_time += delta;
 
   gfx::Transform identity, transform;
 
   transform.Scale3d(2.0, 2.0, 2.0);
 
   scoped_ptr<LayerAnimationElement> base_element(
       LayerAnimationElement::CreateTransformElement(transform, delta));
   scoped_ptr<LayerAnimationElement> inverse_element(
@@ skipping 17 matching lines @@
 }
 
 // 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;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateBoundsElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     start_time += delta;
     element->set_requested_start_time(start_time);
     delegate.SetBoundsFromAnimation(start);
     element->Start(&delegate, 1);
@@ skipping 15 matching lines @@
   CheckApproximatelyEqual(target, target_value.bounds);
 }
 
 // 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;
   float start = 0.0;
   float middle = 0.5;
   float target = 1.0;
-  base::TimeTicks start_time;
-  base::TimeTicks effective_start_time;
+  gfx::FrameTime start_time;
+  gfx::FrameTime effective_start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateOpacityElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     start_time = effective_start_time + delta;
     element->set_requested_start_time(start_time);
     delegate.SetOpacityFromAnimation(start);
     element->Start(&delegate, 1);
     element->Progress(start_time, &delegate);
@@ skipping 19 matching lines @@
   element->GetTargetValue(&target_value);
   EXPECT_FLOAT_EQ(target, target_value.opacity);
 }
 
 // Check that the visibility element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, VisibilityElement) {
   TestLayerAnimationDelegate delegate;
   bool start = true;
   bool target = false;
-  base::TimeTicks start_time;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateVisibilityElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     start_time += delta;
     element->set_requested_start_time(start_time);
     delegate.SetVisibilityFromAnimation(start);
     element->Start(&delegate, 1);
     element->Progress(start_time, &delegate);
@@ skipping 14 matching lines @@
   EXPECT_FALSE(target_value.visibility);
 }
 
 // Check that the Brightness element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, BrightnessElement) {
   TestLayerAnimationDelegate delegate;
   float start = 0.0;
   float middle = 0.5;
   float target = 1.0;
-  base::TimeTicks start_time;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateBrightnessElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     start_time += delta;
     element->set_requested_start_time(start_time);
     delegate.SetBrightnessFromAnimation(start);
     element->Start(&delegate, 1);
     element->Progress(start_time, &delegate);
@@ skipping 14 matching lines @@
   EXPECT_FLOAT_EQ(target, target_value.brightness);
 }
 
 // Check that the Grayscale element progresses the delegate as expected and
 // that the element can be reused after it completes.
 TEST(LayerAnimationElementTest, GrayscaleElement) {
   TestLayerAnimationDelegate delegate;
   float start = 0.0;
   float middle = 0.5;
   float target = 1.0;
-  base::TimeTicks start_time;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateGrayscaleElement(target, delta));
 
   for (int i = 0; i < 2; ++i) {
     start_time += delta;
     element->set_requested_start_time(start_time);
     delegate.SetGrayscaleFromAnimation(start);
     element->Start(&delegate, 1);
     element->Progress(start_time, &delegate);
@@ skipping 16 matching lines @@
 
 // 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);
   properties.insert(LayerAnimationElement::BRIGHTNESS);
   properties.insert(LayerAnimationElement::GRAYSCALE);
-  base::TimeTicks start_time;
+  gfx::FrameTime start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
 
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreatePauseElement(properties, delta));
 
   TestLayerAnimationDelegate delegate;
   TestLayerAnimationDelegate copy = delegate;
 
   start_time += delta;
   element->set_requested_start_time(start_time);
@@ skipping 18 matching lines @@
   EXPECT_FLOAT_EQ(delegate.GetGrayscaleForAnimation(),
                   copy.GetGrayscaleForAnimation());
 }
 
 // Check that a threaded opacity element updates the delegate as expected when
 // aborted.
 TEST(LayerAnimationElementTest, AbortOpacityElement) {
   TestLayerAnimationDelegate delegate;
   float start = 0.0;
   float target = 1.0;
-  base::TimeTicks start_time;
-  base::TimeTicks effective_start_time;
+  gfx::FrameTime start_time;
+  gfx::FrameTime effective_start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateOpacityElement(target, delta));
 
   // Choose a non-linear Tween type.
   gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
   element->set_tween_type(tween_type);
 
   delegate.SetOpacityFromAnimation(start);
 
@@ skipping 17 matching lines @@
                   delegate.GetOpacityForAnimation());
 }
 
 // Check that a threaded transform element updates the delegate as expected when
 // aborted.
 TEST(LayerAnimationElementTest, AbortTransformElement) {
   TestLayerAnimationDelegate delegate;
   gfx::Transform start_transform, target_transform;
   start_transform.Rotate(-30.0);
   target_transform.Rotate(30.0);
-  base::TimeTicks start_time;
-  base::TimeTicks effective_start_time;
+  gfx::FrameTime start_time;
+  gfx::FrameTime effective_start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateTransformElement(target_transform, delta));
 
   // Choose a non-linear Tween type.
   gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
   element->set_tween_type(tween_type);
 
   delegate.SetTransformFromAnimation(start_transform);
 
@@ skipping 15 matching lines @@
   element->Abort(&delegate);
   target_transform.Blend(start_transform,
                          gfx::Tween::CalculateValue(tween_type, 0.5));
   CheckApproximatelyEqual(target_transform,
                           delegate.GetTransformForAnimation());
 }
 
 } // namespace
 
 } // namespace ui