| 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 f2e115f5c46f29470f74c02d7322063fce291b92..0b2d1c48a932ded2b5a2750f3e8bdbfa9479d815 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -1097,10 +1097,12 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
|
| *is_in_gesture_scroll = true;
|
| } else if (gesture_event.type() == blink::WebInputEvent::GestureScrollEnd ||
|
| gesture_event.type() == blink::WebInputEvent::GestureFlingStart) {
|
| - DCHECK(*is_in_gesture_scroll ||
|
| - (gesture_event.type() == blink::WebInputEvent::GestureFlingStart &&
|
| - gesture_event.sourceDevice ==
|
| - blink::WebGestureDevice::WebGestureDeviceTouchpad));
|
| + // TODO(wjmaclean): Re-enable the following DCHECK once crbug.com/695187
|
| + // is fixed.
|
| + // DCHECK(*is_in_gesture_scroll ||
|
| + // (gesture_event.type() == blink::WebInputEvent::GestureFlingStart &&
|
| + // gesture_event.sourceDevice ==
|
| + // blink::WebGestureDevice::WebGestureDeviceTouchpad));
|
| *is_in_gesture_scroll = false;
|
| }
|
|
|
|
|