Forward GestureFlingStart in OOPIF, re-enable DCHECK.

content/browser/renderer_host/render_widget_host_impl.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_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 1105 matching lines @@
               blink::WebGestureDevice::kWebGestureDeviceTouchpad
           ? &is_in_touchpad_gesture_scroll_
           : &is_in_touchscreen_gesture_scroll_;
   if (gesture_event.GetType() == blink::WebInputEvent::kGestureScrollBegin) {
     DCHECK(!(*is_in_gesture_scroll));
     *is_in_gesture_scroll = true;
   } else if (gesture_event.GetType() ==
                  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 ==
             blink::WebGestureDevice::kWebGestureDeviceTouchpad) {
       is_in_touchpad_gesture_fling_ = true;
     }
   }
 
   bool scroll_update_needs_wrapping =
       gesture_event.GetType() == blink::WebInputEvent::kGestureScrollUpdate &&
@@ skipping 1500 matching lines @@
   RenderProcessHost* rph = GetProcess();
   for (std::vector<IPC::Message>::const_iterator i = messages.begin();
        i != messages.end(); ++i) {
     rph->OnMessageReceived(*i);
     if (i->dispatch_error())
       rph->OnBadMessageReceived(*i);
   }
 }
 
 }  // namespace content