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

Unified Diff: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc

Issue 11191068: Remove WTF::currentTime() / WTF::monotonicallyIncreasingTime() uses from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 2 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
« no previous file with comments | « webkit/compositor_bindings/web_to_ccinput_handler_adapter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
}
« no previous file with comments | « webkit/compositor_bindings/web_to_ccinput_handler_adapter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698