| Index: ui/aura/gestures/gesture_recognizer_unittest.cc
|
| ===================================================================
|
| --- ui/aura/gestures/gesture_recognizer_unittest.cc (revision 126124)
|
| +++ ui/aura/gestures/gesture_recognizer_unittest.cc (working copy)
|
| @@ -119,7 +119,7 @@
|
| break;
|
| case ui::ET_GESTURE_LONG_PRESS:
|
| long_press_ = true;
|
| - touch_id_ = gesture->delta_x();
|
| + touch_id_ = gesture->point_id();
|
| break;
|
| default:
|
| NOTREACHED();
|
| @@ -844,7 +844,10 @@
|
| gfx::Rect(0, 0, 123, 45), NULL));
|
|
|
| delegate->Reset();
|
| - GestureEvent tap(ui::ET_GESTURE_TAP, 20, 20, 0, base::Time::Now(), 0, 6);
|
| + GestureEvent::Properties props;
|
| + props.delta_x = 0;
|
| + props.delta_y = 6;
|
| + GestureEvent tap(ui::ET_GESTURE_TAP, 20, 20, 0, base::Time::Now(), props);
|
| root_window()->DispatchGestureEvent(&tap);
|
| EXPECT_TRUE(delegate->mouse_enter());
|
| EXPECT_TRUE(delegate->mouse_press());
|
| @@ -853,8 +856,9 @@
|
| EXPECT_FALSE(delegate->double_click());
|
|
|
| delegate->Reset();
|
| + props.delta_y = 0;
|
| GestureEvent tap2(ui::ET_GESTURE_DOUBLE_TAP, 20, 20, 0,
|
| - base::Time::Now(), 0, 0);
|
| + base::Time::Now(), props);
|
| root_window()->DispatchGestureEvent(&tap2);
|
| EXPECT_TRUE(delegate->mouse_enter());
|
| EXPECT_TRUE(delegate->mouse_press());
|
|
|