Fix test for master device.

ui/events/x/touch_factory_x11.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/events/x/touch_factory_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 14 matching lines @@
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 TouchFactory::TouchFactory()
     : pointer_device_lookup_(),
       touch_device_available_(false),
       touch_events_disabled_(false),
       touch_device_list_(),
       max_touch_points_(-1),
+      virtual_core_keyboard_device_(-1),
       id_generator_(0) {
   if (!DeviceDataManagerX11::GetInstance()->IsXInput2Available())
     return;
 
   XDisplay* display = gfx::GetXDisplay();
   UpdateDeviceList(display);
 
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   touch_events_disabled_ = cmdline->HasSwitch(switches::kTouchEvents) &&
       cmdline->GetSwitchValueASCII(switches::kTouchEvents) ==
@@ skipping 92 matching lines @@
             touch_device_lookup_[devinfo->deviceid] = true;
             touch_device_list_[devinfo->deviceid] = true;
             touch_device_available_ = true;
             if (tci->num_touches > 0 && tci->num_touches > max_touch_points_)
               max_touch_points_ = tci->num_touches;
           }
         }
       }
 #endif
       pointer_device_lookup_[devinfo->deviceid] = true;
+    } else if (devinfo->use == XIMasterKeyboard) {
+      virtual_core_keyboard_device_ = devinfo->deviceid;
     }
 
 #if defined(USE_XI2_MT)
     if (devinfo->use == XIFloatingSlave || devinfo->use == XISlavePointer) {
       for (int k = 0; k < devinfo->num_classes; ++k) {
         XIAnyClassInfo* xiclassinfo = devinfo->classes[k];
         if (xiclassinfo->type == XITouchClass) {
           XITouchClassInfo* tci =
               reinterpret_cast<XITouchClassInfo*>(xiclassinfo);
           // Only care direct touch device (such as touch screen) right now
@@ skipping 11 matching lines @@
   XIEvent* event = static_cast<XIEvent*>(xev->xcookie.data);
   XIDeviceEvent* xiev = reinterpret_cast<XIDeviceEvent*>(event);
 
 #if defined(USE_XI2_MT)
   if (event->evtype == XI_TouchBegin ||
       event->evtype == XI_TouchUpdate ||
       event->evtype == XI_TouchEnd) {
     return !touch_events_disabled_ && IsTouchDevice(xiev->deviceid);
   }
 #endif
-  // Make sure only key-events from the master device are processed.
-  if (event->evtype == XI_KeyPress || event->evtype == XI_KeyRelease)
-    return xiev->deviceid == xiev->sourceid;
+  // Make sure only key-events from the virtual core keyboard are processed.
+  if (event->evtype == XI_KeyPress || event->evtype == XI_KeyRelease) {
+    return (virtual_core_keyboard_device_ < 0) ||
+           (virtual_core_keyboard_device_ == xiev->deviceid);
+  }
 
   if (event->evtype != XI_ButtonPress &&
       event->evtype != XI_ButtonRelease &&
       event->evtype != XI_Motion)
     return true;
 
   if (!pointer_device_lookup_[xiev->deviceid])
     return false;
 
   return IsTouchDevice(xiev->deviceid) ? !touch_events_disabled_ : true;
@@ skipping 156 matching lines @@
       if (ptr[0] || ptr[1])
         touchscreen_ids_.insert(std::make_pair(ptr[0], ptr[1]));
     }
     XFree(prop_return);
   }
 
   XCloseDevice(display, device);
 }
 
 }  // namespace ui