Merge 159810 - Use correct location for Enter/LeaveNotify

ui/base/x/events_x.cc

Index: ui/base/x/events_x.cc
===================================================================
--- ui/base/x/events_x.cc	(revision 160018)
+++ ui/base/x/events_x.cc	(working copy)
@@ -818,6 +818,9 @@
 
 gfx::Point EventLocationFromNative(const base::NativeEvent& native_event) {
   switch (native_event->type) {
+    case EnterNotify:
+    case LeaveNotify:
+      return gfx::Point(native_event->xcrossing.x, native_event->xcrossing.y);
     case ButtonPress:
     case ButtonRelease:
       return gfx::Point(native_event->xbutton.x, native_event->xbutton.y);
@@ -863,6 +866,11 @@
 gfx::Point EventSystemLocationFromNative(
     const base::NativeEvent& native_event) {
   switch (native_event->type) {
+    case EnterNotify:
+    case LeaveNotify: {
+      return gfx::Point(native_event->xcrossing.x_root,
+                        native_event->xcrossing.y_root);
+    }
     case ButtonPress:
     case ButtonRelease: {
       return gfx::Point(native_event->xbutton.x_root,
@@ -897,7 +905,9 @@
 }
 
 bool IsMouseEvent(const base::NativeEvent& native_event) {
-  if (native_event->type == ButtonPress ||
+  if (native_event->type == EnterNotify ||
+      native_event->type == LeaveNotify ||
+      native_event->type == ButtonPress ||
       native_event->type == ButtonRelease ||
       native_event->type == MotionNotify)
     return true;