Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3165)

Unified Diff: cc/animation/timing_function.cc

Issue 2032643003: CC Animation: Erase EaseTimingFunction helpers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gmock
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/timing_function.h ('k') | cc/input/top_controls_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/timing_function.cc
diff --git a/cc/animation/timing_function.cc b/cc/animation/timing_function.cc
index 23f75d517c826d6f8acebcdf52dbc45843230b5b..094f9e95d63a1bf46202125c50917786d75f7be8 100644
--- a/cc/animation/timing_function.cc
+++ b/cc/animation/timing_function.cc
@@ -18,19 +18,21 @@ TimingFunction::~TimingFunction() {}
std::unique_ptr<TimingFunction> CubicBezierTimingFunction::CreatePreset(
EaseType ease_type) {
+ // These numbers come from
+ // http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag.
switch (ease_type) {
case EaseType::EASE:
return base::WrapUnique(
- new CubicBezierTimingFunction(EaseType::EASE, 0.25, 0.1, 0.25, 1.0));
+ new CubicBezierTimingFunction(ease_type, 0.25, 0.1, 0.25, 1.0));
case EaseType::EASE_IN:
- return base::WrapUnique(new CubicBezierTimingFunction(
- EaseType::EASE_IN, 0.42, 0.0, 1.0, 1.0));
+ return base::WrapUnique(
+ new CubicBezierTimingFunction(ease_type, 0.42, 0.0, 1.0, 1.0));
case EaseType::EASE_OUT:
- return base::WrapUnique(new CubicBezierTimingFunction(
- EaseType::EASE_OUT, 0.0, 0.0, 0.58, 1.0));
+ return base::WrapUnique(
+ new CubicBezierTimingFunction(ease_type, 0.0, 0.0, 0.58, 1.0));
case EaseType::EASE_IN_OUT:
- return base::WrapUnique(new CubicBezierTimingFunction(
- EaseType::EASE_IN_OUT, 0.42, 0.0, 0.58, 1));
+ return base::WrapUnique(
+ new CubicBezierTimingFunction(ease_type, 0.42, 0.0, 0.58, 1));
default:
NOTREACHED();
return nullptr;
@@ -72,27 +74,6 @@ 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::CreatePreset(
- CubicBezierTimingFunction::EaseType::EASE);
-}
-
-std::unique_ptr<TimingFunction> EaseInTimingFunction::Create() {
- return CubicBezierTimingFunction::CreatePreset(
- CubicBezierTimingFunction::EaseType::EASE_IN);
-}
-
-std::unique_ptr<TimingFunction> EaseOutTimingFunction::Create() {
- return CubicBezierTimingFunction::CreatePreset(
- CubicBezierTimingFunction::EaseType::EASE_OUT);
-}
-
-std::unique_ptr<TimingFunction> EaseInOutTimingFunction::Create() {
- return CubicBezierTimingFunction::CreatePreset(
- CubicBezierTimingFunction::EaseType::EASE_IN_OUT);
-}
std::unique_ptr<StepsTimingFunction> StepsTimingFunction::Create(
int steps,
« no previous file with comments | « cc/animation/timing_function.h ('k') | cc/input/top_controls_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698