Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_win.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc |
| index ad12eca7954be0aad25116d21f282bedbe69d165..6009346047eca98b85be7bb0f1bd8bb7744a5275 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_win.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_win.cc |
| @@ -2880,10 +2880,16 @@ bool RenderWidgetHostViewWin::ForwardGestureEventToRenderer( |
| return false; |
| LocalGestureEvent* local = static_cast<LocalGestureEvent*>(gesture); |
| - if (local->data().type == WebKit::WebGestureEvent::Undefined) |
| + if (local->data().type == WebKit::WebInputEvent::Undefined) |
| return false; |
| - const WebKit::WebGestureEvent& generatedEvent = local->data(); |
| - render_widget_host_->ForwardGestureEvent(generatedEvent); |
| + const WebKit::WebGestureEvent& gesture_event = local->data(); |
| + if (gesture_event.type == WebKit::WebInputEvent::GestureFlingStart) { |
| + // WebKit requires that a scroll ends first before a fling starts. |
|
rjkroege
2012/08/09 16:51:06
same comment. :-)
|
| + WebKit::WebGestureEvent scroll_end = gesture_event; |
| + scroll_end.type = WebKit::WebInputEvent::GestureScrollEnd; |
| + render_widget_host_->ForwardGestureEvent(scroll_end); |
| + } |
| + render_widget_host_->ForwardGestureEvent(gesture_event); |
| return true; |
| } |