Merge 159810 - Use correct location for Enter/LeaveNotify

ui/base/x/events_x_unittest.cc

Index: ui/base/x/events_x_unittest.cc
===================================================================
--- ui/base/x/events_x_unittest.cc	(revision 160018)
+++ ui/base/x/events_x_unittest.cc	(working copy)
@@ -112,4 +112,26 @@
   // TODO(derat): Test XInput code.
 }
 
+TEST(EventsXTest, EnterLeaveEvent) {
+  XEvent event;
+  event.xcrossing.type = EnterNotify;
+  event.xcrossing.x = 10;
+  event.xcrossing.y = 20;
+  event.xcrossing.x_root = 110;
+  event.xcrossing.y_root = 120;
+
+  EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(&event));
+  EXPECT_EQ("10,20", ui::EventLocationFromNative(&event).ToString());
+  EXPECT_EQ("110,120", ui::EventSystemLocationFromNative(&event).ToString());
+
+  event.xcrossing.type = LeaveNotify;
+  event.xcrossing.x = 30;
+  event.xcrossing.y = 40;
+  event.xcrossing.x_root = 230;
+  event.xcrossing.y_root = 240;
+  EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(&event));
+  EXPECT_EQ("30,40", ui::EventLocationFromNative(&event).ToString());
+  EXPECT_EQ("230,240", ui::EventSystemLocationFromNative(&event).ToString());
+}
+
 }  // namespace ui