Use a bezier timing function for the overview mode animation

ui/gfx/geometry/cubic_bezier_unittest.cc

Index: ui/gfx/geometry/cubic_bezier_unittest.cc
diff --git a/cc/animation/timing_function_unittest.cc b/ui/gfx/geometry/cubic_bezier_unittest.cc
similarity index 24%
rename from cc/animation/timing_function_unittest.cc
rename to ui/gfx/geometry/cubic_bezier_unittest.cc
index 4be225fd6b929f78c1db378b963cd65f3a6e6822..dcd7e53b3b4fe7da7fea04b3fd27a307c30d3e49 100644
--- a/cc/animation/timing_function_unittest.cc
+++ b/ui/gfx/geometry/cubic_bezier_unittest.cc
@@ -2,140 +2,139 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/animation/timing_function.h"
+#include "ui/gfx/geometry/cubic_bezier.h"
 
+#include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace cc {
+namespace gfx {
 namespace {
 
-TEST(TimingFunctionTest, CubicBezierTimingFunction) {
-  scoped_ptr<CubicBezierTimingFunction> function =
-      CubicBezierTimingFunction::Create(0.25, 0.0, 0.75, 1.0);
+TEST(CubicBezierTest, Basic) {
+  CubicBezier function(0.25, 0.0, 0.75, 1.0);
 
   double epsilon = 0.00015;
 
-  EXPECT_NEAR(function->GetValue(0), 0, epsilon);
-  EXPECT_NEAR(function->GetValue(0.05), 0.01136, epsilon);
-  EXPECT_NEAR(function->GetValue(0.1), 0.03978, epsilon);
-  EXPECT_NEAR(function->GetValue(0.15), 0.079780, epsilon);
-  EXPECT_NEAR(function->GetValue(0.2), 0.12803, epsilon);
-  EXPECT_NEAR(function->GetValue(0.25), 0.18235, epsilon);
-  EXPECT_NEAR(function->GetValue(0.3), 0.24115, epsilon);
-  EXPECT_NEAR(function->GetValue(0.35), 0.30323, epsilon);
-  EXPECT_NEAR(function->GetValue(0.4), 0.36761, epsilon);
-  EXPECT_NEAR(function->GetValue(0.45), 0.43345, epsilon);
-  EXPECT_NEAR(function->GetValue(0.5), 0.5, epsilon);
-  EXPECT_NEAR(function->GetValue(0.6), 0.63238, epsilon);
-  EXPECT_NEAR(function->GetValue(0.65), 0.69676, epsilon);
-  EXPECT_NEAR(function->GetValue(0.7), 0.75884, epsilon);
-  EXPECT_NEAR(function->GetValue(0.75), 0.81764, epsilon);
-  EXPECT_NEAR(function->GetValue(0.8), 0.87196, epsilon);
-  EXPECT_NEAR(function->GetValue(0.85), 0.92021, epsilon);
-  EXPECT_NEAR(function->GetValue(0.9), 0.96021, epsilon);
-  EXPECT_NEAR(function->GetValue(0.95), 0.98863, epsilon);
-  EXPECT_NEAR(function->GetValue(1), 1, epsilon);
+  EXPECT_NEAR(function.Solve(0), 0, epsilon);
+  EXPECT_NEAR(function.Solve(0.05), 0.01136, epsilon);
+  EXPECT_NEAR(function.Solve(0.1), 0.03978, epsilon);
+  EXPECT_NEAR(function.Solve(0.15), 0.079780, epsilon);
+  EXPECT_NEAR(function.Solve(0.2), 0.12803, epsilon);
+  EXPECT_NEAR(function.Solve(0.25), 0.18235, epsilon);
+  EXPECT_NEAR(function.Solve(0.3), 0.24115, epsilon);
+  EXPECT_NEAR(function.Solve(0.35), 0.30323, epsilon);
+  EXPECT_NEAR(function.Solve(0.4), 0.36761, epsilon);
+  EXPECT_NEAR(function.Solve(0.45), 0.43345, epsilon);
+  EXPECT_NEAR(function.Solve(0.5), 0.5, epsilon);
+  EXPECT_NEAR(function.Solve(0.6), 0.63238, epsilon);
+  EXPECT_NEAR(function.Solve(0.65), 0.69676, epsilon);
+  EXPECT_NEAR(function.Solve(0.7), 0.75884, epsilon);
+  EXPECT_NEAR(function.Solve(0.75), 0.81764, epsilon);
+  EXPECT_NEAR(function.Solve(0.8), 0.87196, epsilon);
+  EXPECT_NEAR(function.Solve(0.85), 0.92021, epsilon);
+  EXPECT_NEAR(function.Solve(0.9), 0.96021, epsilon);
+  EXPECT_NEAR(function.Solve(0.95), 0.98863, epsilon);
+  EXPECT_NEAR(function.Solve(1), 1, epsilon);
 }
 
-// Tests that the bezier timing function works with knots with y not in (0, 1).
-TEST(TimingFunctionTest, CubicBezierTimingFunctionUnclampedYValues) {
-  scoped_ptr<CubicBezierTimingFunction> function =
-      CubicBezierTimingFunction::Create(0.5, -1.0, 0.5, 2.0);
+// Tests that solving the bezier works with knots with y not in (0, 1).
+TEST(CubicBezierTest, UnclampedYValues) {
+  CubicBezier function(0.5, -1.0, 0.5, 2.0);
 
   double epsilon = 0.00015;
 
-  EXPECT_NEAR(function->GetValue(0.0), 0.0, epsilon);
-  EXPECT_NEAR(function->GetValue(0.05), -0.08954, epsilon);
-  EXPECT_NEAR(function->GetValue(0.1), -0.15613, epsilon);
-  EXPECT_NEAR(function->GetValue(0.15), -0.19641, epsilon);
-  EXPECT_NEAR(function->GetValue(0.2), -0.20651, epsilon);
-  EXPECT_NEAR(function->GetValue(0.25), -0.18232, epsilon);
-  EXPECT_NEAR(function->GetValue(0.3), -0.11992, epsilon);
-  EXPECT_NEAR(function->GetValue(0.35), -0.01672, epsilon);
-  EXPECT_NEAR(function->GetValue(0.4), 0.12660, epsilon);
-  EXPECT_NEAR(function->GetValue(0.45), 0.30349, epsilon);
-  EXPECT_NEAR(function->GetValue(0.5), 0.50000, epsilon);
-  EXPECT_NEAR(function->GetValue(0.55), 0.69651, epsilon);
-  EXPECT_NEAR(function->GetValue(0.6), 0.87340, epsilon);
-  EXPECT_NEAR(function->GetValue(0.65), 1.01672, epsilon);
-  EXPECT_NEAR(function->GetValue(0.7), 1.11992, epsilon);
-  EXPECT_NEAR(function->GetValue(0.75), 1.18232, epsilon);
-  EXPECT_NEAR(function->GetValue(0.8), 1.20651, epsilon);
-  EXPECT_NEAR(function->GetValue(0.85), 1.19641, epsilon);
-  EXPECT_NEAR(function->GetValue(0.9), 1.15613, epsilon);
-  EXPECT_NEAR(function->GetValue(0.95), 1.08954, epsilon);
-  EXPECT_NEAR(function->GetValue(1.0), 1.0, epsilon);
+  EXPECT_NEAR(function.Solve(0.0), 0.0, epsilon);
+  EXPECT_NEAR(function.Solve(0.05), -0.08954, epsilon);
+  EXPECT_NEAR(function.Solve(0.1), -0.15613, epsilon);
+  EXPECT_NEAR(function.Solve(0.15), -0.19641, epsilon);
+  EXPECT_NEAR(function.Solve(0.2), -0.20651, epsilon);
+  EXPECT_NEAR(function.Solve(0.25), -0.18232, epsilon);
+  EXPECT_NEAR(function.Solve(0.3), -0.11992, epsilon);
+  EXPECT_NEAR(function.Solve(0.35), -0.01672, epsilon);
+  EXPECT_NEAR(function.Solve(0.4), 0.12660, epsilon);
+  EXPECT_NEAR(function.Solve(0.45), 0.30349, epsilon);
+  EXPECT_NEAR(function.Solve(0.5), 0.50000, epsilon);
+  EXPECT_NEAR(function.Solve(0.55), 0.69651, epsilon);
+  EXPECT_NEAR(function.Solve(0.6), 0.87340, epsilon);
+  EXPECT_NEAR(function.Solve(0.65), 1.01672, epsilon);
+  EXPECT_NEAR(function.Solve(0.7), 1.11992, epsilon);
+  EXPECT_NEAR(function.Solve(0.75), 1.18232, epsilon);
+  EXPECT_NEAR(function.Solve(0.8), 1.20651, epsilon);
+  EXPECT_NEAR(function.Solve(0.85), 1.19641, epsilon);
+  EXPECT_NEAR(function.Solve(0.9), 1.15613, epsilon);
+  EXPECT_NEAR(function.Solve(0.95), 1.08954, epsilon);
+  EXPECT_NEAR(function.Solve(1.0), 1.0, epsilon);
 }
 
-TEST(TimingFunctionTest, CubicBezierTimingFunctionRange) {
+TEST(CubicBezierTest, Range) {
   double epsilon = 0.00015;
-  float min, max;
+  double min, max;
 
   // Derivative is a constant.
-  scoped_ptr<CubicBezierTimingFunction> function =
-      CubicBezierTimingFunction::Create(0.25, (1.0 / 3.0), 0.75, (2.0 / 3.0));
+  scoped_ptr<CubicBezier> function(
+      new CubicBezier(0.25, (1.0 / 3.0), 0.75, (2.0 / 3.0)));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(0, min);
+  EXPECT_EQ(1, max);
 
   // Derivative is linear.
-  function = CubicBezierTimingFunction::Create(0.25, -0.5, 0.75, (-1.0 / 6.0));
+  function.reset(new CubicBezier(0.25, -0.5, 0.75, (-1.0 / 6.0)));
   function->Range(&min, &max);
   EXPECT_NEAR(min, -0.225, epsilon);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(1, max);
 
   // Derivative has no real roots.
-  function = CubicBezierTimingFunction::Create(0.25, 0.25, 0.75, 0.5);
+  function.reset(new CubicBezier(0.25, 0.25, 0.75, 0.5));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(0, min);
+  EXPECT_EQ(1, max);
 
   // Derivative has exactly one real root.
-  function = CubicBezierTimingFunction::Create(0.0, 1.0, 1.0, 0.0);
+  function.reset(new CubicBezier(0.0, 1.0, 1.0, 0.0));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(0, min);
+  EXPECT_EQ(1, max);
 
   // Derivative has one root < 0 and one root > 1.
-  function = CubicBezierTimingFunction::Create(0.25, 0.1, 0.75, 0.9);
+  function.reset(new CubicBezier(0.25, 0.1, 0.75, 0.9));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(0, min);
+  EXPECT_EQ(1, max);
 
   // Derivative has two roots in [0,1].
-  function = CubicBezierTimingFunction::Create(0.25, 2.5, 0.75, 0.5);
+  function.reset(new CubicBezier(0.25, 2.5, 0.75, 0.5));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
+  EXPECT_EQ(0, min);
   EXPECT_NEAR(max, 1.28818, epsilon);
-  function = CubicBezierTimingFunction::Create(0.25, 0.5, 0.75, -1.5);
+  function.reset(new CubicBezier(0.25, 0.5, 0.75, -1.5));
   function->Range(&min, &max);
   EXPECT_NEAR(min, -0.28818, epsilon);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(1, max);
 
   // Derivative has one root < 0 and one root in [0,1].
-  function = CubicBezierTimingFunction::Create(0.25, 0.1, 0.75, 1.5);
+  function.reset(new CubicBezier(0.25, 0.1, 0.75, 1.5));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
+  EXPECT_EQ(0, min);
   EXPECT_NEAR(max, 1.10755, epsilon);
 
   // Derivative has one root in [0,1] and one root > 1.
-  function = CubicBezierTimingFunction::Create(0.25, -0.5, 0.75, 0.9);
+  function.reset(new CubicBezier(0.25, -0.5, 0.75, 0.9));
   function->Range(&min, &max);
   EXPECT_NEAR(min, -0.10755, epsilon);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(1, max);
 
   // Derivative has two roots < 0.
-  function = CubicBezierTimingFunction::Create(0.25, 0.3, 0.75, 0.633);
+  function.reset(new CubicBezier(0.25, 0.3, 0.75, 0.633));
   function->Range(&min, &max);
-  EXPECT_EQ(0.f, min);
-  EXPECT_EQ(1.f, max);
+  EXPECT_EQ(0, min);
+  EXPECT_EQ(1, max);
 
   // Derivative has two roots > 1.
-  function = CubicBezierTimingFunction::Create(0.25, 0.367, 0.75, 0.7);
+  function.reset(new CubicBezier(0.25, 0.367, 0.75, 0.7));
   function->Range(&min, &max);
   EXPECT_EQ(0.f, min);
   EXPECT_EQ(1.f, max);
 }
 
 }  // namespace
-}  // namespace cc
+}  // namespace gfx