Fix beginSmoothScroll by doing duration computation in ms

content/browser/renderer_host/render_widget_host_view_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/port/browser/smooth_scroll_gesture.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include "content/browser/renderer_host/gtk_window_utils.h"
 #endif
 
 namespace content {
 
 // How long a smooth scroll gesture should run when it is a near scroll.
-static const double kDurationOfNearScrollGestureSec = 0.15;
+static const double kDurationOfNearScrollGestureMs = 150;

[piman, 2012/08/17 19:28:28]

Actually, should those be int64s, since that's what
base::TimeDelta::FromMilliseconds takes?

 
 // How long a smooth scroll gesture should run when it is a far scroll.
-static const double kDurationOfFarScrollGestureSec = 0.5;
+static const double kDurationOfFarScrollGestureMs = 500;
 
 // static
 RenderWidgetHostViewPort* RenderWidgetHostViewPort::FromRWHV(
     RenderWidgetHostView* rwhv) {
   return static_cast<RenderWidgetHostViewPort*>(rwhv);
 }
 
 // static
 RenderWidgetHostViewPort* RenderWidgetHostViewPort::CreateViewForWidget(
     content::RenderWidgetHost* widget) {
@@ skipping 84 matching lines @@
 class BasicMouseWheelSmoothScrollGesture
     : public SmoothScrollGesture {
  public:
   BasicMouseWheelSmoothScrollGesture(bool scroll_down, bool scroll_far)
       : start_time_(base::TimeTicks::HighResNow()),
         scroll_down_(scroll_down),
         scroll_far_(scroll_far) { }
 
   virtual bool ForwardInputEvents(base::TimeTicks now,
                                   RenderWidgetHost* host) OVERRIDE {
-    double duration_in_seconds;
+    double duration_in_ms;
     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;
     event.type = WebKit::WebInputEvent::MouseWheel;
     // TODO(nduca): Figure out plausible value.
     event.deltaY = scroll_down_ ? -10 : 10;
     event.wheelTicksY = scroll_down_ ? 1 : -1;
     event.modifiers = 0;
 
     // TODO(nduca): Figure out plausible x and y values.
@@ skipping 12 matching lines @@
   bool scroll_down_;
   bool scroll_far_;
 };
 
 SmoothScrollGesture* RenderWidgetHostViewBase::CreateSmoothScrollGesture(
     bool scroll_down, bool scroll_far) {
   return new BasicMouseWheelSmoothScrollGesture(scroll_down, scroll_far);
 }
 
 }  // namespace content