Chromium Code Reviews| Index: ui/events/devices/x11/device_data_manager_x11.cc |
| diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc |
| index 0d9d04c9170a89568f1afa5fad64e646476ef954..09cfd405c10addf75cc58fd3647bddd0d159f19f 100644 |
| --- a/ui/events/devices/x11/device_data_manager_x11.cc |
| +++ b/ui/events/devices/x11/device_data_manager_x11.cc |
| @@ -771,6 +771,12 @@ void DeviceDataManagerX11::UpdateScrollClassDevice( |
| DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum); |
| ScrollInfo& info = scroll_data_[deviceid]; |
| + // xinput2 is disabled until edge cases are fixed. |
| + bool xinput2_disabled = true; |
| + if (xinput2_disabled) { |
|
bokan
2016/06/29 18:34:24
No need for the variable and if statement. Just re
|
| + return; |
| + } |
| + |
| bool legacy_scroll_available = |
| (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0; |
| // If the device's highest resolution is lower than the resolution of xinput1 |