Blink Compositor Animation: Make Animation and Curve methods non-virtual.

cc/animation/timing_function.cc

 // Copyright 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 "cc/animation/timing_function.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "cc/base/math_util.h"
 
 namespace cc {
 
 TimingFunction::TimingFunction() {}
 
 TimingFunction::~TimingFunction() {}
 
 std::unique_ptr<TimingFunction> CubicBezierTimingFunction::CreatePreset(
     EaseType ease_type) {
   switch (ease_type) {
     case EaseType::EASE:
-      return EaseTimingFunction::Create();
+      return base::WrapUnique(
+          new CubicBezierTimingFunction(EaseType::EASE, 0.25, 0.1, 0.25, 1.0));
     case EaseType::EASE_IN:
-      return EaseInTimingFunction::Create();
+      return base::WrapUnique(new CubicBezierTimingFunction(
+          EaseType::EASE_IN, 0.42, 0.0, 1.0, 1.0));
     case EaseType::EASE_OUT:
-      return EaseOutTimingFunction::Create();
+      return base::WrapUnique(new CubicBezierTimingFunction(
+          EaseType::EASE_OUT, 0.0, 0.0, 0.58, 1.0));
     case EaseType::EASE_IN_OUT:
-      return EaseInOutTimingFunction::Create();
+      return base::WrapUnique(new CubicBezierTimingFunction(
+          EaseType::EASE_IN_OUT, 0.42, 0.0, 0.58, 1));
     default:
       NOTREACHED();
       return nullptr;
   }
 }
-
 std::unique_ptr<CubicBezierTimingFunction>
 CubicBezierTimingFunction::Create(double x1, double y1, double x2, double y2) {
-  return base::WrapUnique(new CubicBezierTimingFunction(x1, y1, x2, y2));
+  return base::WrapUnique(
+      new CubicBezierTimingFunction(EaseType::CUSTOM, x1, y1, x2, y2));
 }
 
-CubicBezierTimingFunction::CubicBezierTimingFunction(double x1,
+CubicBezierTimingFunction::CubicBezierTimingFunction(EaseType ease_type,
+                                                     double x1,
                                                      double y1,
                                                      double x2,
                                                      double y2)
-    : bezier_(x1, y1, x2, y2) {}
+    : bezier_(x1, y1, x2, y2), ease_type_(ease_type) {}
 
 CubicBezierTimingFunction::~CubicBezierTimingFunction() {}
 
 float CubicBezierTimingFunction::GetValue(double x) const {
   return static_cast<float>(bezier_.Solve(x));
 }
 
 float CubicBezierTimingFunction::Velocity(double x) const {
   return static_cast<float>(bezier_.Slope(x));
 }
 
 void CubicBezierTimingFunction::Range(float* min, float* max) const {
   *min = static_cast<float>(bezier_.range_min());
   *max = static_cast<float>(bezier_.range_max());
 }
 
 std::unique_ptr<TimingFunction> CubicBezierTimingFunction::Clone() const {
   return base::WrapUnique(new CubicBezierTimingFunction(*this));
 }
 
 // These numbers come from
 // http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag.
 std::unique_ptr<TimingFunction> EaseTimingFunction::Create() {
-  return CubicBezierTimingFunction::Create(0.25, 0.1, 0.25, 1.0);
+  return CubicBezierTimingFunction::CreatePreset(
+      CubicBezierTimingFunction::EaseType::EASE);
 }
 
 std::unique_ptr<TimingFunction> EaseInTimingFunction::Create() {
-  return CubicBezierTimingFunction::Create(0.42, 0.0, 1.0, 1.0);
+  return CubicBezierTimingFunction::CreatePreset(
+      CubicBezierTimingFunction::EaseType::EASE_IN);
 }
 
 std::unique_ptr<TimingFunction> EaseOutTimingFunction::Create() {
-  return CubicBezierTimingFunction::Create(0.0, 0.0, 0.58, 1.0);
+  return CubicBezierTimingFunction::CreatePreset(
+      CubicBezierTimingFunction::EaseType::EASE_OUT);
 }
 
 std::unique_ptr<TimingFunction> EaseInOutTimingFunction::Create() {
-  return CubicBezierTimingFunction::Create(0.42, 0.0, 0.58, 1);
+  return CubicBezierTimingFunction::CreatePreset(
+      CubicBezierTimingFunction::EaseType::EASE_IN_OUT);
 }

[alancutter (OOO until 2018), 2016/06/01 02:20:55]

Looks like we can delete these classes now (in another patch).

[loyso (OOO), 2016/06/01 02:36:47]

Yes, that was the plan. EaseInOutTimingFunction is static-only helper, unrelated
to base TimingFunction.

 
 std::unique_ptr<StepsTimingFunction> StepsTimingFunction::Create(
     int steps,
     StepPosition step_position) {
   return base::WrapUnique(new StepsTimingFunction(steps, step_position));
 }
 
 StepsTimingFunction::StepsTimingFunction(int steps, StepPosition step_position)
     : steps_(steps) {
   switch (step_position) {
@@ skipping 26 matching lines @@
 void StepsTimingFunction::Range(float* min, float* max) const {
   *min = 0.0f;
   *max = 1.0f;
 }
 
 float StepsTimingFunction::Velocity(double x) const {
   return 0.0f;
 }
 
 }  // namespace cc