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 3875b45e87fdddd94dc0c0ee334eab1309a31877..cba791d6c1b53af957373b5f7ad7ca7a519531f3 100644 |
--- a/webkit/compositor_bindings/web_animation_impl.cc |
+++ b/webkit/compositor_bindings/web_animation_impl.cc |
@@ -42,7 +42,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve, |
break; |
} |
} |
- animation_ = Animation::create( |
+ animation_ = Animation::Create( |
curve.Pass(), |
animation_id, |
group_id, |
@@ -55,37 +55,39 @@ int WebAnimationImpl::id() { return animation_->id(); } |
WebAnimation::TargetProperty WebAnimationImpl::targetProperty() const { |
return static_cast<WebAnimationImpl::TargetProperty>( |
- animation_->targetProperty()); |
+ animation_->target_property()); |
} |
int WebAnimationImpl::iterations() const { return animation_->iterations(); } |
-void WebAnimationImpl::setIterations(int n) { animation_->setIterations(n); } |
+void WebAnimationImpl::setIterations(int n) { animation_->set_iterations(n); } |
-double WebAnimationImpl::startTime() const { return animation_->startTime(); } |
+double WebAnimationImpl::startTime() const { return animation_->start_time(); } |
void WebAnimationImpl::setStartTime(double monotonic_time) { |
- animation_->setStartTime(monotonic_time); |
+ animation_->set_start_time(monotonic_time); |
} |
-double WebAnimationImpl::timeOffset() const { return animation_->timeOffset(); } |
+double WebAnimationImpl::timeOffset() const { |
+ return animation_->time_offset(); |
+} |
void WebAnimationImpl::setTimeOffset(double monotonic_time) { |
- animation_->setTimeOffset(monotonic_time); |
+ animation_->set_time_offset(monotonic_time); |
} |
bool WebAnimationImpl::alternatesDirection() const { |
- return animation_->alternatesDirection(); |
+ return animation_->alternates_direction(); |
} |
void WebAnimationImpl::setAlternatesDirection(bool alternates) { |
- animation_->setAlternatesDirection(alternates); |
+ animation_->set_alternates_direction(alternates); |
} |
scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation() { |
scoped_ptr<cc::Animation> to_return( |
- animation_->clone(cc::Animation::NonControllingInstance)); |
- to_return->setNeedsSynchronizedStartTime(true); |
+ animation_->Clone(cc::Animation::NonControllingInstance)); |
+ to_return->set_needs_synchronized_start_time(true); |
return to_return.Pass(); |
} |