| 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..51927e4327be15081838d9b071b033260d4c7260 100644
|
| --- a/ui/events/devices/x11/device_data_manager_x11.cc
|
| +++ b/ui/events/devices/x11/device_data_manager_x11.cc
|
| @@ -771,6 +771,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
|
|
|