Index: webkit/compositor_bindings/web_float_animation_curve_impl.cc |
diff --git a/webkit/compositor_bindings/web_float_animation_curve_impl.cc b/webkit/compositor_bindings/web_float_animation_curve_impl.cc |
index 321bab3ca3fd11ada25e06195e693b4967dc3ee0..c75c4c684805b9dc1722c7a6b57351d10013d8e2 100644 |
--- a/webkit/compositor_bindings/web_float_animation_curve_impl.cc |
+++ b/webkit/compositor_bindings/web_float_animation_curve_impl.cc |
@@ -9,15 +9,18 @@ |
#include "cc/timing_function.h" |
#include "webkit/compositor_bindings/web_animation_curve_common.h" |
-namespace WebKit { |
+using WebKit::WebFloatKeyframe; |
+ |
+namespace webkit { |
WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl() |
: curve_(cc::KeyframedFloatAnimationCurve::Create()) {} |
WebFloatAnimationCurveImpl::~WebFloatAnimationCurveImpl() {} |
-WebAnimationCurve::AnimationCurveType WebFloatAnimationCurveImpl::type() const { |
- return WebAnimationCurve::AnimationCurveTypeFloat; |
+WebKit::WebAnimationCurve::AnimationCurveType |
+WebFloatAnimationCurveImpl::type() const { |
+ return WebKit::WebAnimationCurve::AnimationCurveTypeFloat; |
} |
void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { |
@@ -27,7 +30,7 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { |
void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, |
TimingFunctionType type) { |
curve_->AddKeyframe(cc::FloatKeyframe::Create( |
- keyframe.time, keyframe.value, createTimingFunction(type))); |
+ keyframe.time, keyframe.value, CreateTimingFunction(type))); |
} |
void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, |
@@ -51,4 +54,4 @@ WebFloatAnimationCurveImpl::cloneToAnimationCurve() const { |
return curve_->Clone(); |
} |
-} // namespace WebKit |
+} // namespace webkit |