Index: cc/keyframed_animation_curve.cc |
diff --git a/cc/keyframed_animation_curve.cc b/cc/keyframed_animation_curve.cc |
index ef03357a26a30e96238c0a947a8c32f0787214d2..579d78715a9c373c50f0d2eeea00a94b39bea7b3 100644 |
--- a/cc/keyframed_animation_curve.cc |
+++ b/cc/keyframed_animation_curve.cc |
@@ -84,12 +84,12 @@ scoped_ptr<FloatKeyframe> FloatKeyframe::clone() const |
return FloatKeyframe::create(time(), value(), func.Pass()); |
} |
-scoped_ptr<TransformKeyframe> TransformKeyframe::create(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction> timingFunction) |
+scoped_ptr<TransformKeyframe> TransformKeyframe::create(double time, const TransformOperations& value, scoped_ptr<TimingFunction> timingFunction) |
{ |
return make_scoped_ptr(new TransformKeyframe(time, value, timingFunction.Pass())); |
} |
-TransformKeyframe::TransformKeyframe(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction> timingFunction) |
+TransformKeyframe::TransformKeyframe(double time, const TransformOperations& value, scoped_ptr<TimingFunction> timingFunction) |
: Keyframe(time, timingFunction.Pass()) |
, m_value(value) |
{ |
@@ -99,7 +99,7 @@ TransformKeyframe::~TransformKeyframe() |
{ |
} |
-const WebKit::WebTransformOperations& TransformKeyframe::value() const |
+const TransformOperations& TransformKeyframe::value() const |
{ |
return m_value; |
} |
@@ -199,10 +199,10 @@ scoped_ptr<AnimationCurve> KeyframedTransformAnimationCurve::clone() const |
WebTransformationMatrix KeyframedTransformAnimationCurve::getValue(double t) const |
{ |
if (t <= m_keyframes.front()->time()) |
- return m_keyframes.front()->value().apply(); |
+ return m_keyframes.front()->value().Apply(); |
if (t >= m_keyframes.back()->time()) |
- return m_keyframes.back()->value().apply(); |
+ return m_keyframes.back()->value().Apply(); |
size_t i = 0; |
for (; i < m_keyframes.size() - 1; ++i) { |
@@ -215,7 +215,7 @@ WebTransformationMatrix KeyframedTransformAnimationCurve::getValue(double t) con |
if (m_keyframes[i]->timingFunction()) |
progress = m_keyframes[i]->timingFunction()->getValue(progress); |
- return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress); |
+ return m_keyframes[i+1]->value().Blend(m_keyframes[i]->value(), progress); |
} |
} // namespace cc |