| Index: ui/views/widget/root_view_unittest.cc
|
| diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc
|
| index f4836cd7e095d87ee30f8121efbfb755d55d9e9a..d13e6c99c5cb7ad3bdcb9f91098993df03c9cf05 100644
|
| --- a/ui/views/widget/root_view_unittest.cc
|
| +++ b/ui/views/widget/root_view_unittest.cc
|
| @@ -206,11 +206,14 @@
|
| 5,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
|
|
|
| - ui::GestureEvent end1(
|
| - 5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end1(5,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end1);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
| @@ -225,11 +228,14 @@
|
| 5,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| details = root_view->OnEventFromSource(&long_press2);
|
|
|
| - ui::GestureEvent end2(
|
| - 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end2(25,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end2);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
| @@ -244,11 +250,14 @@
|
| 50,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| details = root_view->OnEventFromSource(&long_press3);
|
|
|
| - ui::GestureEvent end3(
|
| - 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end3(25,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end3);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
| @@ -291,11 +300,14 @@
|
| 5,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
|
|
|
| - ui::GestureEvent end1(
|
| - 5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end1(5,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end1);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
| @@ -310,11 +322,14 @@
|
| 5,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| details = root_view->OnEventFromSource(&long_press2);
|
|
|
| - ui::GestureEvent end2(
|
| - 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end2(25,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end2);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
| @@ -329,11 +344,14 @@
|
| 50,
|
| 0,
|
| base::TimeDelta(),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
|
| + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
|
| details = root_view->OnEventFromSource(&long_press3);
|
|
|
| - ui::GestureEvent end3(
|
| - 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
|
| + ui::GestureEvent end3(25,
|
| + 5,
|
| + 0,
|
| + base::TimeDelta(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
|
| details = root_view->OnEventFromSource(&end3);
|
|
|
| EXPECT_FALSE(details.target_destroyed);
|
|
|