Index: ui/events/gesture_detection/gesture_provider_unittest.cc |
diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc |
index aeb1c24899b304723022d2dbc27d2889eff8dfcf..fd678c7cb0111e2e50a339799a4b4c6669052457 100644 |
--- a/ui/events/gesture_detection/gesture_provider_unittest.cc |
+++ b/ui/events/gesture_detection/gesture_provider_unittest.cc |
@@ -823,7 +823,7 @@ TEST_F(GestureProviderTest, FractionalScroll) { |
// Verify that the event co-ordinates are still the precise values we |
// supplied. |
EXPECT_EQ(kFakeCoordX + delta_x * i, gesture.x); |
- EXPECT_EQ(kFakeCoordY + delta_y * i, gesture.y); |
+ EXPECT_FLOAT_EQ(kFakeCoordY + delta_y * i, gesture.y); |
// Verify that we're scrolling vertically by the expected amount |
// (modulo rounding). |
@@ -2340,4 +2340,32 @@ TEST_F(GestureProviderTest, MaxGestureBoundsLength) { |
GetMostRecentGestureEvent().details.bounding_box_f().height()); |
} |
+TEST_F(GestureProviderTest, ZeroRadiusBoundingBox) { |
+ base::TimeTicks event_time = base::TimeTicks::Now(); |
+ int motion_event_id = 0; |
+ |
+ MockMotionEvent event = |
+ ObtainMotionEvent(event_time, MotionEvent::ACTION_DOWN, 10, 20); |
+ event.SetTouchMajor(0); |
+ event.set_id(++motion_event_id); |
jdduke (slow)
2014/08/12 20:33:48
I'd ditch the |motion_event_id| and |set_id|'s in
tdresser
2014/08/12 21:09:39
Done.
|
+ EXPECT_TRUE(gesture_provider_->OnTouchEvent(event)); |
+ EXPECT_EQ(gfx::RectF(10, 20, 0, 0), |
+ GetMostRecentGestureEvent().details.bounding_box()); |
+ |
+ event = ObtainMotionEvent( |
+ event_time, MotionEvent::ACTION_POINTER_DOWN, 10, 20, 110, 120); |
+ event.SetTouchMajor(0); |
+ event.set_id(++motion_event_id); |
+ EXPECT_TRUE(gesture_provider_->OnTouchEvent(event)); |
+ |
+ event = ObtainMotionEvent( |
+ event_time, MotionEvent::ACTION_MOVE, 10, 20, 110, 150); |
+ event.SetTouchMajor(0); |
+ event.set_id(++motion_event_id); |
+ EXPECT_TRUE(gesture_provider_->OnTouchEvent(event)); |
+ |
+ EXPECT_EQ(gfx::RectF(10, 20, 100, 130), |
+ GetMostRecentGestureEvent().details.bounding_box()); |
+} |
+ |
} // namespace ui |