| Index: ui/events/event_unittest.cc
|
| diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
|
| index 4e14ed776766cad365e8e47c3e5180cc93becd34..30784a7fd482de373f9cffe16e665cccbac14414 100644
|
| --- a/ui/events/event_unittest.cc
|
| +++ b/ui/events/event_unittest.cc
|
| @@ -686,7 +686,8 @@ TEST(EventTest, PointerDetailsStylus) {
|
| /* tilt_x */ 45.0f,
|
| /* tilt_y */ -45.0f,
|
| /* tangential_pressure */ 0.7f,
|
| - /* twist */ 196);
|
| + /* twist */ 196,
|
| + /* id */ 3);
|
|
|
| stylus_event.set_pointer_details(pointer_details);
|
| EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
|
| @@ -698,6 +699,7 @@ TEST(EventTest, PointerDetailsStylus) {
|
| EXPECT_EQ(0.0f, stylus_event.pointer_details().radius_y);
|
| EXPECT_EQ(0.7f, stylus_event.pointer_details().tangential_pressure);
|
| EXPECT_EQ(196, stylus_event.pointer_details().twist);
|
| + EXPECT_EQ(3U, stylus_event.pointer_details().id);
|
|
|
| ui::MouseEvent stylus_event_copy(stylus_event);
|
| EXPECT_EQ(stylus_event.pointer_details(),
|
| @@ -723,7 +725,8 @@ TEST(EventTest, PointerDetailsCustomTouch) {
|
| /* tilt_x */ 45.0f,
|
| /* tilt_y */ -45.0f,
|
| /* tangential_pressure */ 0.7f,
|
| - /* twist */ 196);
|
| + /* twist */ 196,
|
| + /* id */ 3);
|
| touch_event.set_pointer_details(pointer_details);
|
|
|
| EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
|
| @@ -735,6 +738,7 @@ TEST(EventTest, PointerDetailsCustomTouch) {
|
| EXPECT_EQ(6.0f, touch_event.pointer_details().radius_y);
|
| EXPECT_EQ(0.7f, touch_event.pointer_details().tangential_pressure);
|
| EXPECT_EQ(196, touch_event.pointer_details().twist);
|
| + EXPECT_EQ(3U, touch_event.pointer_details().id);
|
|
|
| ui::TouchEvent touch_event_copy(touch_event);
|
| EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details());
|
|
|