summaryrefslogtreecommitdiffstats
path: root/cc/timing_function.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
commit184fac5add06d5f4670fa6be4a4d3b39232d51bb (patch)
tree7efc1d20146fcafdbe408fa67292117c41e9393f /cc/timing_function.cc
parentfb7ffba75e81a79436434bab0715be0d6e67bc07 (diff)
downloadchromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.zip
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.gz
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.bz2
cc: Rename cc classes and members to match filenames
BUG=155413 Review URL: https://codereview.chromium.org/11189043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/timing_function.cc')
-rw-r--r--cc/timing_function.cc36
1 files changed, 18 insertions, 18 deletions
diff --git a/cc/timing_function.cc b/cc/timing_function.cc
index 3a4ecd4..b64602e 100644
--- a/cc/timing_function.cc
+++ b/cc/timing_function.cc
@@ -12,63 +12,63 @@ const double epsilon = 1e-6;
namespace cc {
-CCTimingFunction::CCTimingFunction()
+TimingFunction::TimingFunction()
{
}
-CCTimingFunction::~CCTimingFunction()
+TimingFunction::~TimingFunction()
{
}
-double CCTimingFunction::duration() const
+double TimingFunction::duration() const
{
return 1.0;
}
-scoped_ptr<CCCubicBezierTimingFunction> CCCubicBezierTimingFunction::create(double x1, double y1, double x2, double y2)
+scoped_ptr<CubicBezierTimingFunction> CubicBezierTimingFunction::create(double x1, double y1, double x2, double y2)
{
- return make_scoped_ptr(new CCCubicBezierTimingFunction(x1, y1, x2, y2));
+ return make_scoped_ptr(new CubicBezierTimingFunction(x1, y1, x2, y2));
}
-CCCubicBezierTimingFunction::CCCubicBezierTimingFunction(double x1, double y1, double x2, double y2)
+CubicBezierTimingFunction::CubicBezierTimingFunction(double x1, double y1, double x2, double y2)
: m_curve(x1, y1, x2, y2)
{
}
-CCCubicBezierTimingFunction::~CCCubicBezierTimingFunction()
+CubicBezierTimingFunction::~CubicBezierTimingFunction()
{
}
-float CCCubicBezierTimingFunction::getValue(double x) const
+float CubicBezierTimingFunction::getValue(double x) const
{
UnitBezier temp(m_curve);
return static_cast<float>(temp.solve(x, epsilon));
}
-scoped_ptr<CCAnimationCurve> CCCubicBezierTimingFunction::clone() const
+scoped_ptr<AnimationCurve> CubicBezierTimingFunction::clone() const
{
- return make_scoped_ptr(new CCCubicBezierTimingFunction(*this)).PassAs<CCAnimationCurve>();
+ return make_scoped_ptr(new CubicBezierTimingFunction(*this)).PassAs<AnimationCurve>();
}
// These numbers come from http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag.
-scoped_ptr<CCTimingFunction> CCEaseTimingFunction::create()
+scoped_ptr<TimingFunction> EaseTimingFunction::create()
{
- return CCCubicBezierTimingFunction::create(0.25, 0.1, 0.25, 1).PassAs<CCTimingFunction>();
+ return CubicBezierTimingFunction::create(0.25, 0.1, 0.25, 1).PassAs<TimingFunction>();
}
-scoped_ptr<CCTimingFunction> CCEaseInTimingFunction::create()
+scoped_ptr<TimingFunction> EaseInTimingFunction::create()
{
- return CCCubicBezierTimingFunction::create(0.42, 0, 1.0, 1).PassAs<CCTimingFunction>();
+ return CubicBezierTimingFunction::create(0.42, 0, 1.0, 1).PassAs<TimingFunction>();
}
-scoped_ptr<CCTimingFunction> CCEaseOutTimingFunction::create()
+scoped_ptr<TimingFunction> EaseOutTimingFunction::create()
{
- return CCCubicBezierTimingFunction::create(0, 0, 0.58, 1).PassAs<CCTimingFunction>();
+ return CubicBezierTimingFunction::create(0, 0, 0.58, 1).PassAs<TimingFunction>();
}
-scoped_ptr<CCTimingFunction> CCEaseInOutTimingFunction::create()
+scoped_ptr<TimingFunction> EaseInOutTimingFunction::create()
{
- return CCCubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<CCTimingFunction>();
+ return CubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<TimingFunction>();
}
} // namespace cc