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 d1a453e57872b51aa66c4cbed9c218fdf256b96f..afa259e2cce9ee3f42eb0b6ed9079b9a3d92fca1 100644 |
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
@@ -124,7 +124,8 @@ void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float pageScaleFactor, fl |
void WebLayerTreeViewImpl::startPageScaleAnimation(const WebPoint& scroll, bool useAnchor, float newPageScale, double durationSec) |
{ |
- m_layerTreeHost->startPageScaleAnimation(IntSize(scroll.x, scroll.y), useAnchor, newPageScale, durationSec); |
+ base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec * base::Time::kMicrosecondsPerSecond); |
+ m_layerTreeHost->startPageScaleAnimation(IntSize(scroll.x, scroll.y), useAnchor, newPageScale, duration); |
} |
void WebLayerTreeViewImpl::setNeedsAnimate() |
@@ -150,8 +151,9 @@ void WebLayerTreeViewImpl::composite() |
m_layerTreeHost->composite(); |
} |
-void WebLayerTreeViewImpl::updateAnimations(double frameBeginTime) |
+void WebLayerTreeViewImpl::updateAnimations(double frameBeginTimeSeconds) |
{ |
+ base::TimeTicks frameBeginTime = base::TimeTicks::FromInternalValue(frameBeginTimeSeconds * base::Time::kMicrosecondsPerSecond); |
m_layerTreeHost->updateAnimations(frameBeginTime); |
} |