Tap suppression controller forwards the next TapCancel when the stashed TapDown is forwarded.

content/browser/renderer_host/input/tap_suppression_controller_unittest.cc

 // Copyright 2013 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/input/tap_suppression_controller.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
@@ skipping 53 matching lines @@
 
   void SendTapUp() {
     last_actions_ = NONE;
     if (ShouldSuppressTapEnd())
       last_actions_ |= TAP_UP_SUPPRESSED;
     else
       last_actions_ |= TAP_UP_FORWARDED;
   }
 
   void SendTapCancel() {
+    bool stashed_tap_down_forwarded =
+        last_actions_ & STASHED_TAP_DOWN_FORWARDED;
     last_actions_ = NONE;
-    if (ShouldSuppressTapEnd())
+    if (!stashed_tap_down_forwarded && ShouldSuppressTapEnd())
       last_actions_ |= TAP_CANCEL_SUPPRESSED;
     else
       last_actions_ |= TAP_CANCEL_FORWARDED;
   }
 
   void AdvanceTime(const base::TimeDelta& delta) {
     last_actions_ = NONE;
     time_ += delta;
     if (timer_started_ && time_ >= timer_expiry_time_) {
       timer_started_ = false;
@@ skipping 152 matching lines @@
   EXPECT_EQ(MockTapSuppressionController::GFC_IN_PROGRESS,
             tap_suppression_controller_->state());
 
   // Send processed GestureFlingCancel Ack.
   tap_suppression_controller_->SendGestureFlingCancelAck(true);
   EXPECT_EQ(MockTapSuppressionController::NONE,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::LAST_CANCEL_STOPPED_FLING,
             tap_suppression_controller_->state());
 
-  // Send MouseDown. This MouseDown should be suppressed, for now.
+  // Send TapDown. This TapDown should be suppressed, for now.
   tap_suppression_controller_->SendTapDown();
   EXPECT_EQ(MockTapSuppressionController::TAP_DOWN_DEFERRED,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::TAP_DOWN_STASHED,
             tap_suppression_controller_->state());
 
   // Wait more than allowed delay between TapDown and TapUp, so they are not
   // considered a tap. This should release the previously suppressed TapDown.
   tap_suppression_controller_->AdvanceTime(TimeDelta::FromMilliseconds(13));
   EXPECT_EQ(MockTapSuppressionController::STASHED_TAP_DOWN_FORWARDED,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::SUPPRESSING_TAPS,
             tap_suppression_controller_->state());
 
   // Send TapUp. This TapUp should be still suppressed.
   // LongTap should be suppressed when the previously suppressed TapDown is
   // forwarded because of the timer expiration.
   tap_suppression_controller_->SendTapUp();
   EXPECT_EQ(MockTapSuppressionController::TAP_UP_SUPPRESSED,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::SUPPRESSING_TAPS,
             tap_suppression_controller_->state());
 }
 
+// Test TapSuppressionController for when stashed TapDown gets forwarded.
+// The next TapCancel should be forwarded as well to maintain a valid input
+// stream.
+TEST_F(TapSuppressionControllerTest, GFCAckBeforeTapSufficientlyLateTapCancel) {
+  // Send GestureFlingCancel.
+  tap_suppression_controller_->SendGestureFlingCancel();
+  EXPECT_EQ(MockTapSuppressionController::NONE,
+            tap_suppression_controller_->last_actions());
+  EXPECT_EQ(MockTapSuppressionController::GFC_IN_PROGRESS,
+            tap_suppression_controller_->state());
+
+  // Send processed GestureFlingCancel Ack.
+  tap_suppression_controller_->SendGestureFlingCancelAck(true);
+  EXPECT_EQ(MockTapSuppressionController::NONE,
+            tap_suppression_controller_->last_actions());
+  EXPECT_EQ(MockTapSuppressionController::LAST_CANCEL_STOPPED_FLING,
+            tap_suppression_controller_->state());
+
+  // Send TapDown. This TapDown should be suppressed, for now.
+  tap_suppression_controller_->SendTapDown();
+  EXPECT_EQ(MockTapSuppressionController::TAP_DOWN_DEFERRED,
+            tap_suppression_controller_->last_actions());
+  EXPECT_EQ(MockTapSuppressionController::TAP_DOWN_STASHED,
+            tap_suppression_controller_->state());
+
+  // Wait more than the delay for TapDown timer. This should release the
+  // previously stashed TapDown.
+  tap_suppression_controller_->AdvanceTime(TimeDelta::FromMilliseconds(13));
+  EXPECT_EQ(MockTapSuppressionController::STASHED_TAP_DOWN_FORWARDED,
+            tap_suppression_controller_->last_actions());
+  EXPECT_EQ(MockTapSuppressionController::SUPPRESSING_TAPS,
+            tap_suppression_controller_->state());
+
+  // Send TapCancel. This TapCancel should be forwarded.
+  // When a TapDown is forwarded because of the timer expiration, the next
+  // TapCancel should get forwarded as well to maintain a valid input stream.
+  tap_suppression_controller_->SendTapCancel();
+  EXPECT_EQ(MockTapSuppressionController::TAP_CANCEL_FORWARDED,
+            tap_suppression_controller_->last_actions());
+  EXPECT_EQ(MockTapSuppressionController::SUPPRESSING_TAPS,
+            tap_suppression_controller_->state());
+}
+
 // Test TapSuppressionController for when GestureFlingCancel Ack comes before
 // TapDown, but there is a small delay between the Ack and TapDown.
 TEST_F(TapSuppressionControllerTest, GFCAckBeforeTapInsufficientlyLateTapDown) {
   // Send GestureFlingCancel.
   tap_suppression_controller_->SendGestureFlingCancel();
   EXPECT_EQ(MockTapSuppressionController::NONE,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::GFC_IN_PROGRESS,
             tap_suppression_controller_->state());
 
@@ skipping 247 matching lines @@
 
   // Send TapUp. This TapUp should not be suppressed.
   tap_suppression_controller_->SendTapUp();
   EXPECT_EQ(MockTapSuppressionController::TAP_UP_FORWARDED,
             tap_suppression_controller_->last_actions());
   EXPECT_EQ(MockTapSuppressionController::DISABLED,
             tap_suppression_controller_->state());
 }
 
 }  // namespace content