Stop dispatching mouse move events for wheel scrolling in X11.

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 107 matching lines @@
 
   // Updates the list of devices.
   void UpdateDeviceList(Display* display);
 
   // For multitouch events we use slot number to distinguish touches from
   // different fingers. This function returns true if the associated slot
   // for |xiev| can be found and it is saved in |slot|, returns false if
   // no slot can be found.
   bool GetSlotNumber(const XIDeviceEvent* xiev, int* slot);
 
+  // Check if an XI event contains data of the specified type.
+  bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
+
   // Get all event data in one pass. We extract only data types that we know
   // about (defined in enum DataType). The data is not processed (e.g. not
   // filled in by cached values) as in GetEventData.
   void GetEventRawData(const XEvent& xev, EventData* data);
 
   // Get a datum of the specified type. Return true and the value
   // is updated if the data is found, false and value unchanged if the data is
   // not found. In the case of MT-B/XI2.2, the value can come from a previously
   // cached one (see the comment above last_seen_valuator_).
   bool GetEventData(const XEvent& xev, const DataType type, double* value);
@@ skipping 75 matching lines @@
   bool GetDataRange(int deviceid,
                     const DataType type,
                     double* min,
                     double* max);
 
   // Sets up relevant valuator informations for device ids in the device lists.
   // This function is only for test purpose. It does not query the X server for
   // the actual device info, but rather inits the relevant valuator structures
   // to have safe default values for testing.
   void SetDeviceListForTest(const std::vector<int>& touchscreen,
-                            const std::vector<int>& cmt_devices);
+                            const std::vector<int>& cmt_devices,
+                            const std::vector<int>& other_devices);
 
   void SetValuatorDataForTest(XIDeviceEvent* xievent,
                               DataType type,
                               double value);
 
   bool TouchEventNeedsCalibrate(int touch_device_id) const;
 
   // Sets the keys which are still allowed on a disabled keyboard device.
   void SetDisabledKeyboardAllowedKeys(
       scoped_ptr<std::set<KeyboardCode> > excepted_keys);
@@ skipping 14 matching lines @@
   void OnKeyboardDevicesUpdated(
       const std::vector<KeyboardDevice>& devices) override;
 
  private:
   DeviceDataManagerX11();
   ~DeviceDataManagerX11() override;
 
   // Initialize the XInput related system information.
   bool InitializeXInputInternal();
 
-  // Check if an XI event contains data of the specified type.
-  bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
-
   void InitializeValuatorsForTest(int deviceid,
                                   int start_valuator,
                                   int end_valuator,
                                   double min_value,
                                   double max_value);
 
   static const int kMaxXIEventType = XI_LASTEVENT + 1;
   static const int kMaxSlotNum = 10;
 
   // Major opcode for the XInput extension. Used to identify XInput events.
@@ skipping 51 matching lines @@
 
   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_