Redefined the bit WebTouchEvent.causesScrollingIfUncanceled.

ui/events/gesture_detection/filtered_gesture_provider_unittest.cc

Index: ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
diff --git a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc b/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
index 4514946ccc7eca5d3e5398f927d65554f417baac..c1df4a2010a6683a9a1600c49bf06dc5f3742b20 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
@@ -22,7 +22,7 @@ class FilteredGestureProviderTest : public GestureProviderClient,
   base::MessageLoopForUI message_loop_;
 };
 
-TEST_F(FilteredGestureProviderTest, TouchDidGenerateScroll) {
+TEST_F(FilteredGestureProviderTest, TouchMayGenerateScroll) {

[Rick Byers, 2016/02/02 04:24:16]

nit: call it TouchMovedBeyondSlopRegion just to clarify that we're testing this
bit.

[mustaq, 2016/02/04 21:17:21]

Done. Also added a multitouch test in a separate method.

   GestureProvider::Config config;
   FilteredGestureProvider provider(config, this);
 
@@ -33,36 +33,36 @@ TEST_F(FilteredGestureProviderTest, TouchDidGenerateScroll) {
   event.PressPoint(0, 0);
   auto result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_FALSE(result.did_generate_scroll);
+  EXPECT_FALSE(result.moved_beyond_slop_region);
 
   event.MovePoint(0, kSlopRegion / 2.f, 0);
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_FALSE(result.did_generate_scroll);
+  EXPECT_FALSE(result.moved_beyond_slop_region);
 
   // Exceeding the slop should triggering scrolling and be reflected in the API.

[Rick Byers, 2016/02/02 04:24:16]

nit: the comments probably need updating (helps to clarify the exact semantics
of this bit).

[mustaq, 2016/02/04 21:17:21]

Done.

   event.MovePoint(0, kSlopRegion * 2.f, 0);
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_TRUE(result.did_generate_scroll);
+  EXPECT_TRUE(result.moved_beyond_slop_region);
 
   // No movement should indicate no scrolling.
   event.MovePoint(0, kSlopRegion * 2.f, 0);
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);

[Rick Byers, 2016/02/02 04:24:16]

Oh, this doesn't match the definition!  Need to either tweak the definition or
change the implementation.

[mustaq, 2016/02/04 21:17:21]

Done.

-  EXPECT_FALSE(result.did_generate_scroll);
+  EXPECT_FALSE(result.moved_beyond_slop_region);
 
   // Nonzero movement should reflect scrolling after exceeding the slop region.
   event.MovePoint(0, 0, 0);
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_TRUE(result.did_generate_scroll);
+  EXPECT_TRUE(result.moved_beyond_slop_region);
 
   // Ending a touch with no fling should not indicate scrolling.
   event.ReleasePoint();
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_FALSE(result.did_generate_scroll);
+  EXPECT_FALSE(result.moved_beyond_slop_region);

[Rick Byers, 2016/02/02 04:24:16]

IIRC there's nothing actually depending on the value of this bit for touchend
events today, right?  If so I think it would be simpler (and help my use case)
if we updated the definition to make this case true (i.e. one the bit became
true it was always true).

[mustaq, 2016/02/04 21:17:21]

Done.

 
   // Ending a touch with a fling *should* indicate scrolling.
   base::TimeTicks time = base::TimeTicks::Now();
@@ -78,7 +78,7 @@ TEST_F(FilteredGestureProviderTest, TouchDidGenerateScroll) {
   event.ReleasePoint();
   result = provider.OnTouchEvent(event);
   EXPECT_TRUE(result.succeeded);
-  EXPECT_TRUE(result.did_generate_scroll);
+  EXPECT_TRUE(result.moved_beyond_slop_region);
 }
 
 }  // namespace ui