Fix bounding box calculation for touches with radius of 0.

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 805 matching lines @@
 
     ASSERT_LT(0U, GetReceivedGestureCount());
     GestureEventData gesture = GetMostRecentGestureEvent();
     EXPECT_EQ(ET_GESTURE_SCROLL_UPDATE, gesture.type());
     EXPECT_EQ(event_time + kOneMicrosecond * i, gesture.time);
     EXPECT_EQ(1, gesture.details.touch_points());
 
     // 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).
     EXPECT_GE(gesture.details.scroll_y(), (int)delta_y);
     EXPECT_LE(gesture.details.scroll_y(), ((int)delta_y) + 1);
 
     // And that there has been no horizontal motion at all.
     EXPECT_EQ(0, gesture.details.scroll_x());
   }
 }
@@ skipping 1496 matching lines @@
   event =
       ObtainMotionEvent(event_time + kOneMicrosecond, MotionEvent::ACTION_UP);
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP, GetMostRecentGestureEventType());
   EXPECT_EQ(kMaxGestureBoundsLength,
             GetMostRecentGestureEvent().details.bounding_box_f().width());
   EXPECT_EQ(kMaxGestureBoundsLength,
             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 this test, just noise.

[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