Index: content/browser/renderer_host/render_widget_host_view_base.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc |
index afcc2b9bd4b7dbac54450408d8364ffd5a80fb71..a9bf3ed28f4f877a2b21318fc22c7c0523e0e5de 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_base.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc |
@@ -22,10 +22,10 @@ |
namespace content { |
// How long a smooth scroll gesture should run when it is a near scroll. |
-static const double kDurationOfNearScrollGestureSec = 0.15; |
+static const int64 kDurationOfNearScrollGestureMs = 150; |
// How long a smooth scroll gesture should run when it is a far scroll. |
-static const double kDurationOfFarScrollGestureSec = 0.5; |
+static const int64 kDurationOfFarScrollGestureMs = 500; |
// static |
RenderWidgetHostViewPort* RenderWidgetHostViewPort::FromRWHV( |
@@ -130,13 +130,13 @@ class BasicMouseWheelSmoothScrollGesture |
virtual bool ForwardInputEvents(base::TimeTicks now, |
RenderWidgetHost* host) OVERRIDE { |
- double duration_in_seconds; |
+ double duration_in_ms; |
piman
2012/08/17 19:45:44
here too?
|
if (scroll_far_) |
- duration_in_seconds = kDurationOfFarScrollGestureSec; |
+ duration_in_ms = kDurationOfFarScrollGestureMs; |
else |
- duration_in_seconds = kDurationOfNearScrollGestureSec; |
+ duration_in_ms = kDurationOfNearScrollGestureMs; |
- if (now - start_time_ > base::TimeDelta::FromSeconds(duration_in_seconds)) |
+ if (now - start_time_ > base::TimeDelta::FromMilliseconds(duration_in_ms)) |
return false; |
WebKit::WebMouseWheelEvent event; |