Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: ui/events/platform/x11/x11_event_source.cc

Issue 2077163003: Reduced number of UpdateDeviceList calls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed DCHECK_EQ to else if, added ALL_DEVICES enum Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 337273f189ed4abb2d15bf270e5031434208116f..c387839221790bb7857ed30b84383a94d71f0890 100644
--- a/ui/events/platform/x11/x11_event_source.cc
+++ b/ui/events/platform/x11/x11_event_source.cc
@@ -206,9 +206,24 @@ void X11EventSource::ExtractCookieDataDispatchEvent(XEvent* xevent) {
}
void X11EventSource::PostDispatchEvent(XEvent* xevent) {
- if (xevent->type == GenericEvent &&
- (xevent->xgeneric.evtype == XI_HierarchyChanged ||
- xevent->xgeneric.evtype == XI_DeviceChanged)) {
+ bool should_update_device_list = false;
+
+ if (xevent->type == GenericEvent) {
+ if (xevent->xgeneric.evtype == XI_HierarchyChanged) {
+ should_update_device_list = true;
+ } else if (xevent->xgeneric.evtype == XI_DeviceChanged) {
+ XIDeviceChangedEvent* xev =
+ static_cast<XIDeviceChangedEvent*>(xevent->xcookie.data);
+ if (xev->reason == XIDeviceChange) {
+ should_update_device_list = true;
+ } else if (xev->reason == XISlaveSwitch) {
+ ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses(
+ xev->sourceid);
+ }
+ }
+ }
+
+ if (should_update_device_list) {
UpdateDeviceList();
hotplug_event_handler_->OnHotplugEvent();
}
@@ -217,7 +232,7 @@ void X11EventSource::PostDispatchEvent(XEvent* xevent) {
xevent->xcrossing.detail != NotifyInferior &&
xevent->xcrossing.mode != NotifyUngrab) {
// Clear stored scroll data
- ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses();
+ ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses(-1);
sadrul 2016/07/19 15:03:24 ALL_DEVICES?
}
}

Powered by Google App Engine
This is Rietveld 408576698