Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2842203002: Forward GestureFlingStart in OOPIF, re-enable DCHECK. (Closed)
Patch Set: Add test descriptions, comment. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/renderer_host/render_widget_host_input_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a0e5792847b897233fff0f2798cf85794e706b0a..51b04f28c418c77d0356a81923afb6c3480896d6 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1123,12 +1123,11 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
blink::WebInputEvent::kGestureScrollEnd ||
gesture_event.GetType() ==
blink::WebInputEvent::kGestureFlingStart) {
- // 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));
+ DCHECK(
+ *is_in_gesture_scroll ||
+ (gesture_event.GetType() == blink::WebInputEvent::kGestureFlingStart &&
+ gesture_event.source_device ==
+ blink::WebGestureDevice::kWebGestureDeviceTouchpad));
*is_in_gesture_scroll = false;
if (gesture_event.GetType() == blink::WebInputEvent::kGestureFlingStart &&
gesture_event.source_device ==
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/renderer_host/render_widget_host_input_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698