Use correct location for Enter/LeaveNotify

ui/base/x/events_x.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 "ui/base/events/event_constants.h"
 
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 800 matching lines @@
       }
       break;
     }
   }
   NOTREACHED();
   return base::TimeDelta();
 }
 
 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);
     case MotionNotify:
       return gfx::Point(native_event->xmotion.x, native_event->xmotion.y);
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
 
 #if defined(USE_XI2_MT)
@@ skipping 29 matching lines @@
   return gfx::Point();
 }
 
 gfx::Point EventSystemLocationFromNative(
     const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case ButtonPress:
     case ButtonRelease: {
       return gfx::Point(native_event->xbutton.x_root,
                         native_event->xbutton.y_root);
     }

[sadrul, 2012/10/02 21:44:16]

Update for Leave/Enter here too?

[oshima, 2012/10/02 21:58:49]

Done.

     case MotionNotify: {
       return gfx::Point(native_event->xmotion.x_root,
                         native_event->xmotion.y_root);
     }
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
       return gfx::Point(xievent->root_x, xievent->root_y);
     }
   }
@@ skipping 11 matching lines @@
          ui::GetMappedButton(button) : button;
 }
 
 KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
   return KeyboardCodeFromXKeyEvent(native_event);
 }
 
 bool IsMouseEvent(const base::NativeEvent& native_event) {
   if (native_event->type == ButtonPress ||
       native_event->type == ButtonRelease ||
       native_event->type == MotionNotify)

[sadrul, 2012/10/02 21:44:16]

ditto

[oshima, 2012/10/02 21:58:49]

Done.

     return true;
   if (native_event->type == GenericEvent) {
     XIDeviceEvent* xievent =
         static_cast<XIDeviceEvent*>(native_event->xcookie.data);
     return xievent->evtype == XI_ButtonPress ||
            xievent->evtype == XI_ButtonRelease ||
            xievent->evtype == XI_Motion;
   }
   return false;
 }
@@ skipping 146 matching lines @@
     noop->xclient.format = 8;
     DCHECK(!noop->xclient.display);
   }
   // Make sure we use atom from current xdisplay, which may
   // change during the test.
   noop->xclient.message_type = GetNoopEventAtom();
   return noop;
 }
 
 }  // namespace ui