Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
| index 09711bf99e6a98104138484b83ef52f995615260..b340350c3b2276fe58b11c1c1cb97f4d4e404c83 100644 |
| --- a/content/browser/renderer_host/render_widget_host_impl.cc |
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc |
| @@ -282,6 +282,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate, |
| has_touch_handler_(false), |
| is_in_touchpad_gesture_scroll_(false), |
| is_in_touchscreen_gesture_scroll_(false), |
| + is_in_touchpad_gesture_fling_(false), |
| latency_tracker_(), |
| next_browser_snapshot_id_(1), |
| owned_by_render_frame_host_(false), |
| @@ -1018,6 +1019,11 @@ void RenderWidgetHostImpl::StartNewContentRenderingTimeout( |
| } |
| void RenderWidgetHostImpl::ForwardMouseEvent(const WebMouseEvent& mouse_event) { |
| + if (GetView()->IsInVR() && |
|
dtapuska
2017/04/13 14:48:25
Can we put a comment here indicating why we are do
asimjour1
2017/04/13 16:31:35
Done.
|
| + (is_in_touchpad_gesture_scroll_ || is_in_touchpad_gesture_fling_)) { |
| + return; |
| + } |
| + |
| ForwardMouseEventWithLatencyInfo(mouse_event, |
| ui::LatencyInfo(ui::SourceEventType::OTHER)); |
| if (owner_delegate_) |
| @@ -1111,6 +1117,8 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo( |
| // gesture_event.sourceDevice == |
| // blink::WebGestureDevice::WebGestureDeviceTouchpad)); |
| *is_in_gesture_scroll = false; |
| + if (gesture_event.type() == blink::WebInputEvent::GestureFlingStart) |
|
dtapuska
2017/04/13 14:48:25
I think this needs a check that the source device
asimjour1
2017/04/13 16:31:35
Done.
|
| + is_in_touchpad_gesture_fling_ = true; |
| } |
| bool scroll_update_needs_wrapping = |
| @@ -2219,6 +2227,7 @@ void RenderWidgetHostImpl::DidOverscroll( |
| } |
| void RenderWidgetHostImpl::DidStopFlinging() { |
| + is_in_touchpad_gesture_fling_ = false; |
| if (view_) |
| view_->DidStopFlinging(); |
| } |