[Android] Always insert a TouchCancel if window or tab focus is lost

ui/events/gesture_detection/gesture_provider_unittest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 54 matching lines @@
     gesture_provider_.reset();
   }
 
   // GestureProviderClient
   virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE {
     if (gesture.type == ET_GESTURE_SCROLL_BEGIN)
       active_scroll_begin_event_.reset(new GestureEventData(gesture));
     gestures_.push_back(gesture);
   }
 
+  bool CancelActiveTouchSequence() {
+    if (!gesture_provider_->current_down_event())
+      return false;
+    return gesture_provider_->OnTouchEvent(
+        *gesture_provider_->current_down_event()->Cancel());
+  }
+
   bool HasReceivedGesture(EventType type) const {
     for (size_t i = 0; i < gestures_.size(); ++i) {
       if (gestures_[i].type == type)
         return true;
     }
     return false;
   }
 
   const GestureEventData& GetMostRecentGestureEvent() const {
     EXPECT_FALSE(gestures_.empty());
@@ skipping 210 matching lines @@
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
 
   Wait(GetShowPressTimeout() + kFiveMilliseconds);
   EXPECT_EQ(ET_GESTURE_SHOW_PRESS, GetMostRecentGestureEventType());
 
   Wait(GetLongPressTimeout() + kFiveMilliseconds);
   EXPECT_EQ(ET_GESTURE_LONG_PRESS, GetMostRecentGestureEventType());
 
   // The long press triggers window focus loss by opening a context menu
-  gesture_provider_->CancelActiveTouchSequence();
+  EXPECT_TRUE(CancelActiveTouchSequence());
   EXPECT_EQ(ET_GESTURE_TAP_CANCEL, GetMostRecentGestureEventType());
 }
 
 TEST_F(GestureProviderTest, TapCancelledWhenScrollBegins) {
   base::TimeTicks event_time = base::TimeTicks::Now();
 
   MockMotionEvent event =
       ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
 
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
@@ skipping 648 matching lines @@
 
   MockMotionEvent event =
       ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
 
   const base::TimeDelta long_press_timeout =
       GetLongPressTimeout() + GetShowPressTimeout() + kFiveMilliseconds * 2;
   Wait(long_press_timeout);
   EXPECT_EQ(ET_GESTURE_LONG_PRESS, GetMostRecentGestureEventType());
 
-  gesture_provider_->CancelActiveTouchSequence();
+  EXPECT_TRUE(CancelActiveTouchSequence());
   EXPECT_EQ(ET_GESTURE_TAP_CANCEL, GetMostRecentGestureEventType());
 
   event = ObtainMotionEvent(event_time + long_press_timeout,
                             MotionEvent::ACTION_UP);
   gesture_provider_->OnTouchEvent(event);
   EXPECT_FALSE(HasReceivedGesture(ET_GESTURE_LONG_TAP));
 }
 
-// Verify that ignoring the remaining touch sequence triggers proper touch and
-// gesture cancellation.
+// Verify that inserting a touch cancel event will trigger proper touch and
+// gesture sequence cancellation.
 TEST_F(GestureProviderTest, CancelActiveTouchSequence) {
   base::TimeTicks event_time = base::TimeTicks::Now();
 
-  gesture_provider_->CancelActiveTouchSequence();
+  EXPECT_FALSE(CancelActiveTouchSequence());
   EXPECT_EQ(0U, GetReceivedGestureCount());
 
   MockMotionEvent event =
       ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
 
-  gesture_provider_->CancelActiveTouchSequence();
+  ASSERT_TRUE(CancelActiveTouchSequence());
   EXPECT_EQ(ET_GESTURE_TAP_CANCEL, GetMostRecentGestureEventType());
 
   // Subsequent MotionEvent's are dropped until ACTION_DOWN.
   event = ObtainMotionEvent(event_time + kFiveMilliseconds,
                             MotionEvent::ACTION_MOVE);
   EXPECT_FALSE(gesture_provider_->OnTouchEvent(event));
 
   event = ObtainMotionEvent(event_time + kFiveMilliseconds * 2,
                             MotionEvent::ACTION_UP);
   EXPECT_FALSE(gesture_provider_->OnTouchEvent(event));
 
   event = ObtainMotionEvent(event_time + kFiveMilliseconds * 3,
                             MotionEvent::ACTION_DOWN);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP_DOWN, GetMostRecentGestureEventType());
 }
 
 }  // namespace ui