Removed DeviceDataManagerX11::scrollclass_devices_

ui/events/devices/x11/device_data_manager_x11.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 
 #include <stddef.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 200 matching lines @@
   return true;
 }
 
 bool DeviceDataManagerX11::IsXInput2Available() const {
   return xi_opcode_ != -1;
 }
 
 void DeviceDataManagerX11::UpdateDeviceList(Display* display) {
   cmt_devices_.reset();
   touchpads_.reset();
-  scrollclass_devices_.reset();
   master_pointers_.clear();
   for (int i = 0; i < kMaxDeviceNum; ++i) {
     valuator_count_[i] = 0;
     valuator_lookup_[i].clear();
     data_type_lookup_[i].clear();
     valuator_min_[i].clear();
     valuator_max_[i].clear();
     scroll_data_[i].horizontal.number = -1;
     scroll_data_[i].horizontal.seen = false;
     scroll_data_[i].vertical.number = -1;
@@ skipping 185 matching lines @@
   return cmt_devices_[xievent->sourceid];
 }
 
 int DeviceDataManagerX11::GetScrollClassEventDetail(const XEvent& xev) const {
   if (xev.type != GenericEvent)
     return SCROLL_TYPE_NO_SCROLL;
 
   XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev.xcookie.data);
   if (xievent->sourceid >= kMaxDeviceNum)
     return SCROLL_TYPE_NO_SCROLL;
-  if (!scrollclass_devices_[xievent->sourceid])
-    return SCROLL_TYPE_NO_SCROLL;
   int horizontal_id = scroll_data_[xievent->sourceid].horizontal.number;
   int vertical_id = scroll_data_[xievent->sourceid].vertical.number;
-  return (XIMaskIsSet(xievent->valuators.mask, horizontal_id)
+  return (horizontal_id != -1 &&
+                  XIMaskIsSet(xievent->valuators.mask, horizontal_id)
               ? SCROLL_TYPE_HORIZONTAL
               : 0) |
-         (XIMaskIsSet(xievent->valuators.mask, vertical_id)
+         (vertical_id != -1 && XIMaskIsSet(xievent->valuators.mask, vertical_id)
               ? SCROLL_TYPE_VERTICAL
               : 0);
 }
 
 int DeviceDataManagerX11::GetScrollClassDeviceDetail(const XEvent& xev) const {
   if (xev.type != GenericEvent)
     return SCROLL_TYPE_NO_SCROLL;
 
   XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev.xcookie.data);
   if (xiev->sourceid >= kMaxDeviceNum || xiev->deviceid >= kMaxDeviceNum)
@@ skipping 345 matching lines @@
       info.vertical.position = 0;
       info.vertical.seen = false;
       break;
     case XIScrollTypeHorizontal:
       info.horizontal.number = scroll_class_info->number;
       info.horizontal.increment = scroll_class_info->increment;
       info.horizontal.position = 0;
       info.horizontal.seen = false;
       break;
   }
-  scrollclass_devices_[deviceid] = true;
 }
 
 double DeviceDataManagerX11::ExtractAndUpdateScrollOffset(
     ScrollInfo::AxisInfo* axis,
     double valuator) const {
   double offset = 0;
   if (axis->seen)
     offset = axis->position - valuator;
   axis->seen = true;
   axis->position = valuator;
@@ skipping 73 matching lines @@
     } else {
       keyboards.erase(it);
       ++blocked_iter;
     }
   }
   // Notify base class of updated list.
   DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
 }
 
 }  // namespace ui