aura: Preprocess an XEvent to make changes for 'alt-click to right-click' before dispatching begins.

This fixes a crash that happens from converting an alt-click to right-click.

BUG=126529
TEST=manually

Review URL: https://chromiumcodereview.appspot.com/10377071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136311 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 23 deletions

diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index 1beb58f..6c57af0 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -409,23 +409,6 @@ int GetEventFlagsForButton(int button) {
   }
 }
 
-void DetectAltClick(XIDeviceEvent* xievent) {
-  if ((xievent->evtype == XI_ButtonPress ||
-      xievent->evtype == XI_ButtonRelease) &&
-        (xievent->mods.effective & Mod1Mask) &&
-        xievent->detail == 1) {
-    xievent->mods.effective &= ~Mod1Mask;
-    xievent->detail = 3;
-    if (xievent->evtype == XI_ButtonRelease) {
-      // On the release clear the left button from the existing state and the
-      // mods, and set the right button.
-      XISetMask(xievent->buttons.mask, 3);
-      XIClearMask(xievent->buttons.mask, 1);
-      xievent->mods.effective &= ~Button1Mask;
-    }
-  }
-}
-
 int GetButtonMaskForX2Event(XIDeviceEvent* xievent) {
   int buttonflags = 0;
   for (int i = 0; i < 8 * xievent->buttons.mask_len; i++) {
@@ -616,9 +599,6 @@ EventType EventTypeFromNative(const base::NativeEvent& native_event) {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
 
-      // Map Alt+Button1 to Button3
-      DetectAltClick(xievent);
-
       if (factory->IsTouchDevice(xievent->sourceid))
         return GetTouchEventType(native_event);
 
@@ -677,9 +657,6 @@ int EventFlagsFromNative(const base::NativeEvent& native_event) {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
 
-      // Map Alt+Button1 to Button3.
-      DetectAltClick(xievent);
-
       const bool touch =
           TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid);
       switch (xievent->evtype) {