| 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 a4d1566d008d8281ba8c7bc96e3a3a8b951dba9f..58962d0f4ef6e8b7a4df2d3c82794d565f14623b 100644
|
| --- a/ui/events/devices/x11/device_data_manager_x11.cc
|
| +++ b/ui/events/devices/x11/device_data_manager_x11.cc
|
| @@ -772,6 +772,10 @@ void DeviceDataManagerX11::UpdateScrollClassDevice(
|
| DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
|
| ScrollInfo& info = scroll_data_[deviceid];
|
|
|
| + // TODO: xinput2 is disabled until edge cases are fixed.
|
| + // http://crbug.com/616308
|
| + return;
|
| +
|
| bool legacy_scroll_available =
|
| (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
|
| // If the device's highest resolution is lower than the resolution of xinput1
|
|
|