gesture recognizer: Fix computing the bounding box of the rectangles.

ui/aura/gestures/gesture_recognizer_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
@@ skipping 698 matching lines @@
   EXPECT_FALSE(delegate->begin());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_TRUE(delegate->scroll_begin());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_EQ(29, delegate->scroll_x());
   EXPECT_EQ(29, delegate->scroll_y());
   EXPECT_EQ(gfx::Point(1, 1).ToString(),
             delegate->scroll_begin_position().ToString());
 
+  // When scrolling with a sinle finger, the bounding box of the gesture should

[rjkroege, 2012/07/27 14:16:48]

sinle -> single.

[sadrul, 2012/07/27 14:46:46]

Done.

+  // be empty, since it's a single point and the radius for testing is zero.
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
+
   // Move some more to generate a few more scroll updates.
   SendScrollEvent(root_window(), 110, 211, kTouchId, delegate.get());
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->begin());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_EQ(-20, delegate->scroll_x());
   EXPECT_EQ(-19, delegate->scroll_y());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
 
   SendScrollEvent(root_window(), 140, 215, kTouchId, delegate.get());
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->begin());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_EQ(30, delegate->scroll_x());
   EXPECT_EQ(4, delegate->scroll_y());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
 
   // Release the touch. This should end the scroll.
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId, press.time_stamp() +
                      base::TimeDelta::FromMilliseconds(50));
   root_window()->DispatchTouchEvent(&release);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->begin());
   EXPECT_TRUE(delegate->end());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_TRUE(delegate->scroll_end());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
+}
+
+// Check that the bounding box during a scroll event is correct.
+TEST_F(GestureRecognizerTest, GestureEventScrollBoundingBox) {
+  for (int radius = 1; radius <= 10; ++radius) {
+    ui::GestureConfiguration::set_default_radius(radius);
+    scoped_ptr<GestureEventConsumeDelegate> delegate(
+        new GestureEventConsumeDelegate());
+    const int kWindowWidth = 123;
+    const int kWindowHeight = 45;
+    const int kTouchId = 5;
+    gfx::Rect bounds(100, 200, kWindowWidth, kWindowHeight);
+    scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+        delegate.get(), -1234, bounds, NULL));
+
+    const int kPositionX = 101;
+    const int kPositionY = 201;
+    delegate->Reset();
+    TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(kPositionX, kPositionY),
+                     kTouchId, GetTime());
+    root_window()->DispatchTouchEvent(&press);
+    EXPECT_EQ(gfx::Rect(kPositionX - radius,
+                        kPositionY - radius,
+                        radius * 2,
+                        radius * 2).ToString(),
+              delegate->bounding_box().ToString());
+
+    const int kScrollAmount = 50;
+    SendScrollEvents(root_window(), kPositionX, kPositionY, GetTime(),
+        1, 1, kTouchId, 1, kScrollAmount, delegate.get());
+    EXPECT_EQ(gfx::Point(1, 1).ToString(),
+              delegate->scroll_begin_position().ToString());
+    EXPECT_EQ(gfx::Rect(kPositionX + kScrollAmount - radius,
+                        kPositionY + kScrollAmount - radius,
+                        radius * 2,
+                        radius * 2).ToString(),
+              delegate->bounding_box().ToString());
+
+    // Release the touch. This should end the scroll.
+    delegate->Reset();
+    TouchEvent release(ui::ET_TOUCH_RELEASED,
+                       gfx::Point(kPositionX, kPositionY),
+                       kTouchId, press.time_stamp() +
+                       base::TimeDelta::FromMilliseconds(50));
+    root_window()->DispatchTouchEvent(&release);
+    EXPECT_EQ(gfx::Rect(kPositionX - radius,
+                        kPositionY - radius,
+                        radius * 2,
+                        radius * 2).ToString(),
+              delegate->bounding_box().ToString());
+  }
+  ui::GestureConfiguration::set_default_radius(0);
 }
 
 // Check Scroll End Events report correct velocities
 // if the user was on a horizontal rail
 TEST_F(GestureRecognizerTest, GestureEventHorizontalRailFling) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kTouchId = 7;
   gfx::Rect bounds(0, 0, 1000, 1000);
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
@@ skipping 657 matching lines @@
   TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),
                     kTouchId2, GetTime());
   root->DispatchTouchEvent(&press2);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());  // no touch down for second tap.
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_TRUE(delegate->pinch_begin());
+  EXPECT_EQ(gfx::Rect(10, 10, 120, 291).ToString(),
+            delegate->bounding_box().ToString());
 
   // Move the first finger.
   delegate->Reset();
   TouchEvent move3(ui::ET_TOUCH_MOVED, gfx::Point(95, 201),
                    kTouchId1, GetTime());
   root->DispatchTouchEvent(&move3);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_TRUE(delegate->pinch_update());
+  EXPECT_EQ(gfx::Rect(10, 10, 85, 191).ToString(),
+            delegate->bounding_box().ToString());
 
   // Now move the second finger.
   delegate->Reset();
   TouchEvent move4(ui::ET_TOUCH_MOVED, gfx::Point(55, 15),
                    kTouchId2, GetTime());
   root->DispatchTouchEvent(&move4);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_TRUE(delegate->pinch_update());
+  EXPECT_EQ(gfx::Rect(55, 15, 40, 186).ToString(),
+            delegate->bounding_box().ToString());
 
   // Release the first finger. This should end pinch.
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId1, press.time_stamp() +
                      base::TimeDelta::FromMilliseconds(50));
   root->DispatchTouchEvent(&release);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_TRUE(delegate->pinch_end());
+  EXPECT_EQ(gfx::Rect(55, 15, 46, 186).ToString(),
+            delegate->bounding_box().ToString());
 
   // Move the second finger. This should still generate a scroll.
   delegate->Reset();
   TouchEvent move5(ui::ET_TOUCH_MOVED, gfx::Point(25, 10),
                    kTouchId2, GetTime());
   root->DispatchTouchEvent(&move5);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_FALSE(delegate->pinch_update());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
 }
 
 TEST_F(GestureRecognizerTest, GestureEventPinchFromScrollFromPinch) {
 scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kWindowWidth = 300;
   const int kWindowHeight = 400;
   const int kTouchId1 = 5;
   const int kTouchId2 = 3;
   gfx::Rect bounds(5, 5, kWindowWidth, kWindowHeight);
@@ skipping 56 matching lines @@
   delegate->Reset();
   TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 301),
                    kTouchId1, GetTime());
   root->DispatchTouchEvent(&press);
   EXPECT_FALSE(delegate->tap());
   EXPECT_TRUE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
 
   // Press the second finger far enough to break two finger tap. It should
   // instead cause a scroll-begin and pinch-begin.
   delegate->Reset();
   TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),
                     kTouchId2, GetTime());
   root->DispatchTouchEvent(&press2);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());  // no touch down for second tap.
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_TRUE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_TRUE(delegate->pinch_begin());
+  EXPECT_EQ(gfx::Rect(10, 10, 91, 291).ToString(),
+            delegate->bounding_box().ToString());
 
   // Move the first finger.
   delegate->Reset();
   TouchEvent move3(ui::ET_TOUCH_MOVED, gfx::Point(65, 201),
                    kTouchId1, GetTime());
   root->DispatchTouchEvent(&move3);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_TRUE(delegate->pinch_update());
+  EXPECT_EQ(gfx::Rect(10, 10, 55, 191).ToString(),
+            delegate->bounding_box().ToString());
 
   // Now move the second finger.
   delegate->Reset();
   TouchEvent move4(ui::ET_TOUCH_MOVED, gfx::Point(55, 15),
                    kTouchId2, GetTime());
   root->DispatchTouchEvent(&move4);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_TRUE(delegate->pinch_update());
+  EXPECT_EQ(gfx::Rect(55, 15, 10, 186).ToString(),
+            delegate->bounding_box().ToString());
 
   // Release the first finger. This should end pinch.
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId1, press.time_stamp() +
                      base::TimeDelta::FromMilliseconds(50));
   root->DispatchTouchEvent(&release);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_TRUE(delegate->pinch_end());
+  EXPECT_EQ(gfx::Rect(55, 15, 46, 186).ToString(),
+            delegate->bounding_box().ToString());
 
   // Move the second finger. This should still generate a scroll.
   delegate->Reset();
   TouchEvent move5(ui::ET_TOUCH_MOVED, gfx::Point(25, 10),
                    kTouchId2, GetTime());
   root->DispatchTouchEvent(&move5);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->pinch_begin());
   EXPECT_FALSE(delegate->pinch_update());
+  EXPECT_TRUE(delegate->bounding_box().IsEmpty());
 }
 
 TEST_F(GestureRecognizerTest, GestureEventIgnoresDisconnectedEvents) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
 
   TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                       6, GetTime());
   root_window()->DispatchTouchEvent(&release1);
   EXPECT_FALSE(delegate->tap());
@@ skipping 647 matching lines @@
   EXPECT_FALSE(delegate->begin());
   EXPECT_TRUE(delegate->end());
   EXPECT_FALSE(delegate->double_tap());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_TRUE(delegate->scroll_end());
 }
 
 }  // namespace test
 }  // namespace aura