Merge 159810 - Use correct location for Enter/LeaveNotify

ui/base/x/events_x_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstring>
 
 #include <X11/Xlib.h>
 
 // Generically-named #defines from Xlib that conflict with symbols in GTest.
 #undef Bool
@@ skipping 94 matching lines @@
   EXPECT_EQ(ui::ET_MOUSEWHEEL, ui::EventTypeFromNative(&event));
 
   // We should return ET_UNKNOWN for the release event instead of returning
   // ET_MOUSEWHEEL; otherwise we'll scroll twice for each scrollwheel step.
   InitButtonEvent(&event, false, location, 4, 0);
   EXPECT_EQ(ui::ET_UNKNOWN, ui::EventTypeFromNative(&event));
 
   // 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