Merge DeviceDataManagerX11 valuator information.

ui/events/devices/x11/device_data_manager_x11.h

 // 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.
 
 #ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
 #define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
 
 // Generically-named #defines from Xlib is conflicting with symbols in GTest.
 // So many tests .cc file #undef Bool before including device_data_manager.h,
 // which makes Bool unrecognized in XInput2.h.
@@ skipping 283 matching lines @@
       double increment;
       // Current scroll position; used to find the difference between events.
       double position;
       // If true then scroll has been seen in this direction.
       bool seen;
     };
 
     AxisInfo vertical, horizontal;
   };
 
+  // Information from XIValuatorClassInfo.
+  struct ValuatorInfo {
+    // The valuator number.
+    int number = -1;
+    // The valuator min value.
+    double min = 0.0;
+    // The valuator max value.
+    double max = 0.0;
+  };
+
   DeviceDataManagerX11();
   ~DeviceDataManagerX11() override;
 
   // Initialize the XInput related system information.
   bool InitializeXInputInternal();
 
   void InitializeValuatorsForTest(int deviceid,
                                   int start_valuator,
                                   int end_valuator,
                                   double min_value,
@@ skipping 38 matching lines @@
   // A quick lookup table for determining if events from the XI device
   // should be blocked.
   std::bitset<kMaxDeviceNum> blocked_devices_;
 
   // The set of keys allowed while the keyboard is blocked.
   std::unique_ptr<std::set<KeyboardCode>> blocked_keyboard_allowed_keys_;
 
   // Number of valuators on the specific device.
   int valuator_count_[kMaxDeviceNum];
 
-  // Index table to find the valuator for DataType on the specific device
-  // by valuator_lookup_[device_id][data_type].
-  std::vector<int> valuator_lookup_[kMaxDeviceNum];
+  // Index table to find valuator number, min and max for DataType on the
+  // specific device by valuator_lookup_[device_id][data_type].
+  std::vector<ValuatorInfo> valuator_lookup_[kMaxDeviceNum];
 
   // Indicates if the user has disabled high precision scrolling support.
   bool high_precision_scrolling_disabled_;
 
   // Index table to find the horizontal and vertical scroll valuator
   // numbers, scroll increments and scroll position.
   ScrollInfo scroll_data_[kMaxDeviceNum];
 
   // Index table to find the DataType for valuator on the specific device
   // by data_type_lookup_[device_id][valuator].
   std::vector<int> data_type_lookup_[kMaxDeviceNum];
 
-  // Index table to find the min & max value of the Valuator on a specific
-  // device.
-  std::vector<double> valuator_min_[kMaxDeviceNum];
-  std::vector<double> valuator_max_[kMaxDeviceNum];
-
   // Table to keep track of the last seen value for the specified valuator for
   // a specified slot of a device. Defaults to 0 if the valuator for that slot
   // was not specified in an earlier event. With MT-B/XI2.2, valuators in an
   // XEvent are not reported if the values haven't changed from the previous
   // event. So it is necessary to remember these valuators so that chrome
   // doesn't think X/device doesn't know about the valuators. We currently
   // use this only on touchscreen devices.
   std::vector<double> last_seen_valuator_[kMaxDeviceNum][kMaxSlotNum];
 
   // Map that stores meta-data for blocked keyboards. This is needed to restore
   // devices when they are re-enabled.
   std::map<int, ui::InputDevice> blocked_keyboard_devices_;
 
   // X11 atoms cache.
   X11AtomCache atom_cache_;
 
   unsigned char button_map_[256];
   int button_map_count_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_