diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 03:49:11 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 03:49:11 +0000 |
| commit | 44437a2af771d8302a128a38aa25953ce7eaa51f (patch) | |
| tree | f2051ff7f8471dd8d6531c154ffb215a8ea0041f /ui/views/view_unittest.cc | |
| parent | 915344d9e1057eaa4bb8aa62bfdbaafb94234bf0 (diff) | |
| download | chromium_src-44437a2af771d8302a128a38aa25953ce7eaa51f.zip chromium_src-44437a2af771d8302a128a38aa25953ce7eaa51f.tar.gz chromium_src-44437a2af771d8302a128a38aa25953ce7eaa51f.tar.bz2 | |
Gesture related changes for views:
. Makes capture send both gesture and mouse events to the same view.
. Makes gesture handling consistant with mouse handling. We only
handle targetting a single view and reset the target on touch up.
BUG=124277
TEST=none
R=ben@chromium.org,sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10479010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 8acd0bb..70e6cee 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -602,6 +602,10 @@ TEST_F(ViewTest, GestureEvent) { EXPECT_EQ(gfx::Point(10, 10), v2->location_); EXPECT_EQ(ui::ET_UNKNOWN, v1->last_gesture_event_type_); + // Simulate an up so that RootView is no longer targetting |v3|. + GestureEventForTest g1_up(ui::ET_GESTURE_TAP_UP, 110, 110, 0); + root->OnGestureEvent(g1_up); + v1->Reset(); v2->Reset(); v3->Reset(); @@ -613,6 +617,15 @@ TEST_F(ViewTest, GestureEvent) { EXPECT_EQ(gfx::Point(80, 80), v1->location_); EXPECT_EQ(ui::ET_UNKNOWN, v2->last_gesture_event_type_); + // Send event |g1| again. Even though the coordinates target |v3| it should go + // to |v1| as that is the view the touch was initially down on. + v1->last_gesture_event_type_ = ui::ET_UNKNOWN; + v3->last_gesture_event_type_ = ui::ET_UNKNOWN; + root->OnGestureEvent(g1); + EXPECT_EQ(ui::ET_GESTURE_TAP, v1->last_gesture_event_type_); + EXPECT_EQ(ui::ET_UNKNOWN, v3->last_gesture_event_type_); + EXPECT_EQ("110,110", v1->location_.ToString()); + widget->CloseNow(); } |