| Index: ui/events/mojo/struct_traits_unittest.cc
|
| diff --git a/ui/events/mojo/struct_traits_unittest.cc b/ui/events/mojo/struct_traits_unittest.cc
|
| index 5cc64e09a39e5452f675c0e39aa74ee32f080c70..62b9649e13bd798f8bfaee66bcca94a3808ad9f2 100644
|
| --- a/ui/events/mojo/struct_traits_unittest.cc
|
| +++ b/ui/events/mojo/struct_traits_unittest.cc
|
| @@ -163,27 +163,28 @@ TEST_F(StructTraitsTest, PointerEvent) {
|
| PointerEvent kTestData[] = {
|
| // Mouse pointer events:
|
| {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE,
|
| - PointerEvent::kMousePointerId,
|
| + PointerEvent::kMousePointerId, 0,
|
| PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
|
| {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
|
| EF_LEFT_MOUSE_BUTTON, PointerEvent::kMousePointerId,
|
| + EF_LEFT_MOUSE_BUTTON,
|
| PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
|
| {ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30),
|
| EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
|
| - PointerEvent::kMousePointerId,
|
| + PointerEvent::kMousePointerId, EF_RIGHT_MOUSE_BUTTON,
|
| PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
|
| {ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30),
|
| - EF_BACK_MOUSE_BUTTON, PointerEvent::kMousePointerId,
|
| + EF_BACK_MOUSE_BUTTON, PointerEvent::kMousePointerId, 0,
|
| PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
|
|
|
| // Touch pointer events:
|
| - {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 1,
|
| + {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 1, 0,
|
| PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 1.0, 2.0, 3.0, 4.0,
|
| 5.0),
|
| base::TimeTicks()},
|
| {ET_POINTER_CANCELLED, gfx::Point(120, 120), gfx::Point(2, 3), EF_NONE, 2,
|
| - PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 5.5, 4.5, 3.5, 2.5,
|
| - 0.5),
|
| + 0, PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, 5.5, 4.5, 3.5,
|
| + 2.5, 0.5),
|
| base::TimeTicks()},
|
| };
|
|
|
| @@ -199,6 +200,8 @@ TEST_F(StructTraitsTest, PointerEvent) {
|
| EXPECT_EQ(kTestData[i].location(), output_ptr_event->location());
|
| EXPECT_EQ(kTestData[i].root_location(), output_ptr_event->root_location());
|
| EXPECT_EQ(kTestData[i].pointer_id(), output_ptr_event->pointer_id());
|
| + EXPECT_EQ(kTestData[i].changed_button_flags(),
|
| + output_ptr_event->changed_button_flags());
|
| EXPECT_EQ(kTestData[i].pointer_details(),
|
| output_ptr_event->pointer_details());
|
| }
|
|
|