Reduced number of UpdateDeviceList calls

ui/events/platform/x11/x11_event_source.cc

Index: ui/events/platform/x11/x11_event_source.cc
diff --git a/ui/events/platform/x11/x11_event_source.cc b/ui/events/platform/x11/x11_event_source.cc
index aa2549adc1ba8b64a6378a02d6d5eb1c05b77c08..8409cb77a1f963c893bcf1de6488839cfdd770d0 100644
--- a/ui/events/platform/x11/x11_event_source.cc
+++ b/ui/events/platform/x11/x11_event_source.cc
@@ -209,12 +209,23 @@ void X11EventSource::ExtractCookieDataDispatchEvent(XEvent* xevent) {
 
 void X11EventSource::PostDispatchEvent(XEvent* xevent) {
   if (xevent->type == GenericEvent &&
-      (xevent->xgeneric.evtype == XI_HierarchyChanged ||
-       xevent->xgeneric.evtype == XI_DeviceChanged)) {
+      xevent->xgeneric.evtype == XI_HierarchyChanged) {
     UpdateDeviceList();
     hotplug_event_handler_->OnHotplugEvent();
   }
 
+  if (xevent->type == GenericEvent &&
+      xevent->xgeneric.evtype == XI_DeviceChanged) {
+    XIDeviceChangedEvent* xev =
+        static_cast<XIDeviceChangedEvent*>(xevent->xcookie.data);
+    if (xev->reason == XIDeviceChange) {
+      UpdateDeviceList();
+      hotplug_event_handler_->OnHotplugEvent();
+    } else {  // XISlaveSwitch
+      ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses();
+    }
+  }
+

[sadrul, 2016/06/20 19:37:30]

How about:

  bool should_update_list = false;
  if (xevent->type == GenericEvent) {
    if (xevent->xgeneric.evtype == XI_HierarchyChanged) {
      should_update_list = true;
    } else if (XI_DeviceChanged) {
      if (XIDeviceChange) {
        should_update_list = true;
      } else {
        DCHECK_EQ(XISlaveSwitch, xev->reason);
        InvalidateScrollClasses();
      }
    }
  }
  if (should_update_list) {
    UpdateDeviceList();
    hotplug...
  }

[Will Shackleton, 2016/06/21 16:27:46]

Done.

   if (xevent->type == EnterNotify &&
       xevent->xcrossing.detail != NotifyInferior &&
       xevent->xcrossing.mode != NotifyUngrab) {