Don't suppress Showpress after a GFC followed by Tap down suppression

Showpress should get forwarded after a GFC followed by Tap down suppression.

Bug: 842221
Change-Id: I60beaf3296557ec8c3d3d25b627f272b82114eed
Reviewed-on: https://chromium-review.googlesource.com/1055653Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Sahel Sharifymoghaddam <sahel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557958}

content/browser/renderer_host/input/fling_controller.cc

@@ -80,7 +80,6 @@ bool FlingController::ShouldForwardForTapSuppression(
       }
       return true;
     case WebInputEvent::kGestureTapDown:
-    case WebInputEvent::kGestureShowPress:
     case WebInputEvent::kGestureTapUnconfirmed:
     case WebInputEvent::kGestureTapCancel:
     case WebInputEvent::kGestureTap:

content/browser/renderer_host/input/fling_controller_unittest.cc

@@ -505,7 +505,8 @@ TEST_F(FlingControllerTest, MiddleClickAutoScrollFling) {
   EXPECT_FALSE(FlingInProgress());
 }
 
-TEST_F(FlingControllerTest, NoLongPressSuppressionAfterTapDownSuppression) {
+TEST_F(FlingControllerTest,
+       NoShowPressOrLongPressSuppressionAfterTapDownSuppression) {
   base::TimeTicks progress_time = base::TimeTicks::Now();
   SimulateFlingStart(blink::kWebGestureDeviceTouchscreen,
                      gfx::Vector2dF(1000, 0));
@@ -527,6 +528,13 @@ TEST_F(FlingControllerTest, NoLongPressSuppressionAfterTapDownSuppression) {
   EXPECT_TRUE(fling_controller_->FilterGestureEvent(
       GestureEventWithLatencyInfo(tap_down)));
 
+  // The GestureShowPress shouldn't get filtered.
+  WebGestureEvent show_press(WebInputEvent::kGestureShowPress, 0,
+                             base::TimeTicks::Now(),
+                             blink::kWebGestureDeviceTouchscreen);
+  EXPECT_FALSE(fling_controller_->FilterGestureEvent(
+      GestureEventWithLatencyInfo(show_press)));
+
   // The GestureLongPress shouldn't get filtered.
   WebGestureEvent long_press(WebInputEvent::kGestureLongPress, 0,
                              base::TimeTicks::Now(),

content/browser/renderer_host/input/touchscreen_tap_suppression_controller.cc

@@ -24,7 +24,6 @@ bool TouchscreenTapSuppressionController::FilterTapEvent(
     case WebInputEvent::kGestureTapDown:
       return ShouldSuppressTapDown();
 
-    case WebInputEvent::kGestureShowPress:
     case WebInputEvent::kGestureTapUnconfirmed:
     case WebInputEvent::kGestureTapCancel:
     case WebInputEvent::kGestureTap: