Ozone X11 platform

ui/events/devices/x11/device_data_manager_x11.cc

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 9db81c19c7e88216cf14fb16fceda7c504ddc259..62e60f92e6627e39b6b2f1c2f89aa355971df227 100644
--- a/ui/events/devices/x11/device_data_manager_x11.cc
+++ b/ui/events/devices/x11/device_data_manager_x11.cc
@@ -367,8 +367,7 @@ bool DeviceDataManagerX11::GetEventData(const XEvent& xev,
   return false;
 }
 
-bool DeviceDataManagerX11::IsXIDeviceEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsXIDeviceEvent(const XEvent* native_event) const {
   if (native_event->type != GenericEvent ||
       native_event->xcookie.extension != xi_opcode_)
     return false;
@@ -376,7 +375,7 @@ bool DeviceDataManagerX11::IsXIDeviceEvent(
 }
 
 bool DeviceDataManagerX11::IsTouchpadXInputEvent(
-    const base::NativeEvent& native_event) const {
+    const XEvent* native_event) const {
   if (native_event->type != GenericEvent)
     return false;
 
@@ -387,8 +386,7 @@ bool DeviceDataManagerX11::IsTouchpadXInputEvent(
   return touchpads_[xievent->sourceid];
 }
 
-bool DeviceDataManagerX11::IsCMTDeviceEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsCMTDeviceEvent(const XEvent* native_event) const {
   if (native_event->type != GenericEvent)
     return false;
 
@@ -399,8 +397,7 @@ bool DeviceDataManagerX11::IsCMTDeviceEvent(
   return cmt_devices_[xievent->sourceid];
 }
 
-bool DeviceDataManagerX11::IsCMTGestureEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsCMTGestureEvent(const XEvent* native_event) const {
   return (IsScrollEvent(native_event) ||
           IsFlingEvent(native_event) ||
           IsCMTMetricsEvent(native_event));
@@ -412,8 +409,7 @@ bool DeviceDataManagerX11::HasEventData(
   return (idx >= 0) && XIMaskIsSet(xiev->valuators.mask, idx);
 }
 
-bool DeviceDataManagerX11::IsScrollEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsScrollEvent(const XEvent* native_event) const {
   if (!IsCMTDeviceEvent(native_event))
     return false;
 
@@ -423,8 +419,7 @@ bool DeviceDataManagerX11::IsScrollEvent(
           HasEventData(xiev, DT_CMT_SCROLL_Y));
 }
 
-bool DeviceDataManagerX11::IsFlingEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsFlingEvent(const XEvent* native_event) const {
   if (!IsCMTDeviceEvent(native_event))
     return false;
 
@@ -435,8 +430,7 @@ bool DeviceDataManagerX11::IsFlingEvent(
           HasEventData(xiev, DT_CMT_FLING_STATE));
 }
 
-bool DeviceDataManagerX11::IsCMTMetricsEvent(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::IsCMTMetricsEvent(const XEvent* native_event) const {
   if (!IsCMTDeviceEvent(native_event))
     return false;
 
@@ -447,8 +441,7 @@ bool DeviceDataManagerX11::IsCMTMetricsEvent(
           HasEventData(xiev, DT_CMT_METRICS_DATA2));
 }
 
-bool DeviceDataManagerX11::HasGestureTimes(
-    const base::NativeEvent& native_event) const {
+bool DeviceDataManagerX11::HasGestureTimes(const XEvent* native_event) const {
   if (!IsCMTDeviceEvent(native_event))
     return false;
 
@@ -458,13 +451,12 @@ bool DeviceDataManagerX11::HasGestureTimes(
           HasEventData(xiev, DT_CMT_END_TIME));
 }
 
-void DeviceDataManagerX11::GetScrollOffsets(
-    const base::NativeEvent& native_event,
-    float* x_offset,
-    float* y_offset,
-    float* x_offset_ordinal,
-    float* y_offset_ordinal,
-    int* finger_count) {
+void DeviceDataManagerX11::GetScrollOffsets(const XEvent* native_event,
+                                            float* x_offset,
+                                            float* y_offset,
+                                            float* x_offset_ordinal,
+                                            float* y_offset_ordinal,
+                                            int* finger_count) {
   *x_offset = 0;
   *y_offset = 0;
   *x_offset_ordinal = 0;
@@ -486,13 +478,12 @@ void DeviceDataManagerX11::GetScrollOffsets(
     *finger_count = static_cast<int>(data[DT_CMT_FINGER_COUNT]);
 }
 
-void DeviceDataManagerX11::GetFlingData(
-    const base::NativeEvent& native_event,
-    float* vx,
-    float* vy,
-    float* vx_ordinal,
-    float* vy_ordinal,
-    bool* is_cancel) {
+void DeviceDataManagerX11::GetFlingData(const XEvent* native_event,
+                                        float* vx,
+                                        float* vy,
+                                        float* vx_ordinal,
+                                        float* vy_ordinal,
+                                        bool* is_cancel) {
   *vx = 0;
   *vy = 0;
   *vx_ordinal = 0;
@@ -514,11 +505,10 @@ void DeviceDataManagerX11::GetFlingData(
     *vy_ordinal = data[DT_CMT_ORDINAL_Y];
 }
 
-void DeviceDataManagerX11::GetMetricsData(
-    const base::NativeEvent& native_event,
-    GestureMetricsType* type,
-    float* data1,
-    float* data2) {
+void DeviceDataManagerX11::GetMetricsData(const XEvent* native_event,
+                                          GestureMetricsType* type,
+                                          float* data1,
+                                          float* data2) {
   *type = kGestureMetricsTypeUnknown;
   *data1 = 0;
   *data2 = 0;
@@ -550,10 +540,9 @@ void DeviceDataManagerX11::UpdateButtonMap() {
                                          arraysize(button_map_));
 }
 
-void DeviceDataManagerX11::GetGestureTimes(
-    const base::NativeEvent& native_event,
-    double* start_time,
-    double* end_time) {
+void DeviceDataManagerX11::GetGestureTimes(const XEvent* native_event,
+                                           double* start_time,
+                                           double* end_time) {
   *start_time = 0;
   *end_time = 0;
 
@@ -709,8 +698,7 @@ void DeviceDataManagerX11::EnableDevice(unsigned int deviceid) {
   }
 }
 
-bool DeviceDataManagerX11::IsEventBlocked(
-    const base::NativeEvent& native_event) {
+bool DeviceDataManagerX11::IsEventBlocked(const XEvent* native_event) {
   // Only check XI2 events which have a source device id.
   if (native_event->type != GenericEvent)
     return false;