Index: webkit/renderer/compositor_bindings/web_animation_impl.cc |
diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.cc b/webkit/renderer/compositor_bindings/web_animation_impl.cc |
index c401d5c974128060ca7a6f59530fa726ff1dd463..12ceb2c52cc538ed74d535e949f8c9228a8624f2 100644 |
--- a/webkit/renderer/compositor_bindings/web_animation_impl.cc |
+++ b/webkit/renderer/compositor_bindings/web_animation_impl.cc |
@@ -81,18 +81,21 @@ int WebAnimationImpl::iterations() const { return animation_->iterations(); } |
void WebAnimationImpl::setIterations(int n) { animation_->set_iterations(n); } |
-double WebAnimationImpl::startTime() const { return animation_->start_time(); } |
+double WebAnimationImpl::startTime() const { |
+ return animation_->ticks_inseconds(animation_->start_time()); |
+} |
void WebAnimationImpl::setStartTime(double monotonic_time) { |
- animation_->set_start_time(monotonic_time); |
+ animation_->set_start_time(base::TimeTicks::FromInternalValue( |
+ monotonic_time * base::Time::kMicrosecondsPerSecond)); |
} |
double WebAnimationImpl::timeOffset() const { |
- return animation_->time_offset(); |
+ return animation_->delta_inseconds(animation_->time_offset()); |
} |
void WebAnimationImpl::setTimeOffset(double monotonic_time) { |
- animation_->set_time_offset(monotonic_time); |
+ animation_->set_time_offset(base::TimeDelta::FromSeconds(monotonic_time)); |
} |
bool WebAnimationImpl::alternatesDirection() const { |