Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc |
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
index 85a0fec8575d29a649066c7c4c397bae7a1f5657..5165f98eb0d0be11fd6e2ef966ea69620df2480e 100644 |
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
@@ -150,10 +150,18 @@ void WebLayerTreeViewImpl::composite() |
m_layerTreeHost->composite(); |
} |
+// TODO(ajuma): Remove this after the WebKit patch to use the 2-argument version lands. |
void WebLayerTreeViewImpl::updateAnimations(double frameBeginTimeSeconds) |
{ |
base::TimeTicks frameBeginTime = base::TimeTicks::FromInternalValue(frameBeginTimeSeconds * base::Time::kMicrosecondsPerSecond); |
- m_layerTreeHost->updateAnimations(frameBeginTime); |
+ m_layerTreeHost->updateAnimations(frameBeginTime, base::Time::Now()); |
+} |
+ |
+void WebLayerTreeViewImpl::updateAnimations(double monotonicFrameBeginTimeSeconds, double wallClockFrameBeginTimeSeconds) |
+{ |
+ base::TimeTicks monotonicFrameBeginTime = base::TimeTicks::FromInternalValue(monotonicFrameBeginTimeSeconds * base::Time::kMicrosecondsPerSecond); |
+ base::Time wallClockFrameBeginTime = base::Time::FromInternalValue(wallClockFrameBeginTimeSeconds* base::Time::kMicrosecondsPerSecond); |
Ian Vollick
2013/01/15 03:27:37
It looks like Time has a ::FromDoubleT method that
ajuma
2013/01/15 16:24:08
Done.
|
+ m_layerTreeHost->updateAnimations(monotonicFrameBeginTime, wallClockFrameBeginTime); |
} |
void WebLayerTreeViewImpl::didStopFlinging() |