[Android] Disable fling cancel filtering in the GestureEventQueue

content/browser/renderer_host/input/gesture_event_queue_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 55 matching lines @@
 
   // TouchpadTapSuppressionControllerClient
   void SendMouseEventImmediately(
       const MouseEventWithLatencyInfo& event) override {}
 
  protected:
   static GestureEventQueue::Config DefaultConfig() {
     return GestureEventQueue::Config();
   }
 
+  void SetUpForGFCFilteringDisabled() {
+    GestureEventQueue::Config config;
+    config.enable_fling_cancel_filtering = false;
+    queue_.reset(new GestureEventQueue(this, this, config));
+  }
+
   void SetUpForDebounce(int interval_ms) {
     queue()->set_debounce_interval_time_ms_for_testing(interval_ms);
   }
 
   void SimulateGestureEvent(const WebGestureEvent& gesture) {
     queue()->QueueEvent(GestureEventWithLatencyInfo(gesture));
   }
 
   void SimulateGestureEvent(WebInputEvent::Type type,
                             WebGestureDevice sourceDevice) {
@@ skipping 973 matching lines @@
   EXPECT_EQ(WebInputEvent::GestureFlingCancel, merged_event.type);
   EXPECT_EQ(5U, GestureEventQueueSize());
 }
 
 INSTANTIATE_TEST_CASE_P(AllSources,
                         GestureEventQueueWithSourceTest,
                         testing::Values(blink::WebGestureDeviceTouchscreen,
                                         blink::WebGestureDeviceTouchpad));
 #endif  // GTEST_HAS_PARAM_TEST
 
+TEST_F(GestureEventQueueTest, GestureFlingCancelFilteringDisabled) {
+  SetUpForGFCFilteringDisabled();
+
+  // If so configured, GFC events should never be filtered, even if there are
+  // no active flings.
+  SimulateGestureEvent(WebInputEvent::GestureFlingCancel,
+                       blink::WebGestureDeviceTouchscreen);
+  EXPECT_EQ(0, ActiveFlingCount());
+  EXPECT_EQ(1U, GetAndResetSentGestureEventCount());
+  EXPECT_EQ(1U, GestureEventQueueSize());
+}
+
 // Test that a GestureScrollEnd | GestureFlingStart are deferred during the
 // debounce interval, that Scrolls are not and that the deferred events are
 // sent after that timer fires.
 TEST_F(GestureEventQueueTest, DebounceDefersFollowingGestureEvents) {
   SetUpForDebounce(3);
 
   SimulateGestureEvent(WebInputEvent::GestureScrollUpdate,
                        blink::WebGestureDeviceTouchscreen);
   EXPECT_EQ(1U, GetAndResetSentGestureEventCount());
   EXPECT_EQ(1U, GestureEventQueueSize());
@@ skipping 85 matching lines @@
       WebInputEvent::GestureScrollUpdate};
 
   for (unsigned i = 0; i < sizeof(expected) / sizeof(WebInputEvent::Type);
       i++) {
     WebGestureEvent merged_event = GestureEventQueueEventAt(i);
     EXPECT_EQ(expected[i], merged_event.type);
   }
 }
 
 }  // namespace content