Index: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
index 3bb1b27806f9cd9f7afdf3677ea446f61a87f9db..165a1fb427ecf9fbbbb0c19c4b8ead57169e85ea 100644 |
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
@@ -80,9 +80,11 @@ public: |
virtual void startPageScaleAnimation(WebSize targetPosition, |
bool anchorPoint, |
float pageScale, |
- double startTime, |
- double duration) OVERRIDE |
+ double startTimeSec, |
+ double durationSec) OVERRIDE |
{ |
+ base::TimeTicks startTime = base::TimeTicks::FromInternalValue(startTimeSec * base::Time::kMicrosecondsPerSecond); |
+ base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec * base::Time::kMicrosecondsPerSecond); |
m_client->startPageScaleAnimation(convert(targetPosition), anchorPoint, pageScale, startTime, duration); |
} |
@@ -102,9 +104,10 @@ void WebToCCInputHandlerAdapter::bindToClient(cc::InputHandlerClient* client) |
m_handler->bindToClient(m_clientAdapter.get()); |
} |
-void WebToCCInputHandlerAdapter::animate(double monotonicTime) |
+void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) |
{ |
- m_handler->animate(monotonicTime); |
+ double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); |
+ m_handler->animate(monotonicTimeSeconds); |
} |
} |