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

Unified Diff: webkit/compositor_bindings/web_animation_impl.cc

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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
Index: webkit/compositor_bindings/web_animation_impl.cc
diff --git a/webkit/compositor_bindings/web_animation_impl.cc b/webkit/compositor_bindings/web_animation_impl.cc
index bc09cb8364cd00eeb89c5a575523cfb6b7879240..afb1f6b1f04fa54bde510a352011d671ab096c4d 100644
--- a/webkit/compositor_bindings/web_animation_impl.cc
+++ b/webkit/compositor_bindings/web_animation_impl.cc
@@ -15,7 +15,9 @@
using cc::Animation;
using cc::AnimationIdProvider;
-namespace WebKit {
+using WebKit::WebAnimationCurve;
+
+namespace webkit {
WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve,
TargetProperty target_property,
@@ -32,13 +34,13 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve,
case WebAnimationCurve::AnimationCurveTypeFloat: {
const WebFloatAnimationCurveImpl* float_curve_impl =
static_cast<const WebFloatAnimationCurveImpl*>(&web_curve);
- curve = float_curve_impl->cloneToAnimationCurve();
+ curve = float_curve_impl->CloneToAnimationCurve();
break;
}
case WebAnimationCurve::AnimationCurveTypeTransform: {
const WebTransformAnimationCurveImpl* transform_curve_impl =
static_cast<const WebTransformAnimationCurveImpl*>(&web_curve);
- curve = transform_curve_impl->cloneToAnimationCurve();
+ curve = transform_curve_impl->CloneToAnimationCurve();
break;
}
}
@@ -53,7 +55,7 @@ WebAnimationImpl::~WebAnimationImpl() {}
int WebAnimationImpl::id() { return animation_->id(); }
-WebAnimation::TargetProperty WebAnimationImpl::targetProperty() const {
+WebKit::WebAnimation::TargetProperty WebAnimationImpl::targetProperty() const {
return static_cast<WebAnimationImpl::TargetProperty>(
animation_->target_property());
}
@@ -84,11 +86,11 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates) {
animation_->set_alternates_direction(alternates);
}
-scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation() {
+scoped_ptr<cc::Animation> WebAnimationImpl::CloneToAnimation() {
scoped_ptr<cc::Animation> to_return(
animation_->Clone(cc::Animation::NonControllingInstance));
to_return->set_needs_synchronized_start_time(true);
return to_return.Pass();
}
-} // namespace WebKit
+} // namespace webkit
« no previous file with comments | « webkit/compositor_bindings/web_animation_impl.h ('k') | webkit/compositor_bindings/web_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698