[PATCH 4/11] ozone: evdev: Move EventModifiersEvdev usage to EventFactoryEvdev

ui/events/ozone/evdev/event_factory_evdev.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/ozone/evdev/event_factory_evdev.h"
 
 #include <fcntl.h>
 #include <linux/input.h>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
     OpenInputDeviceReplyCallback;
 
 struct OpenInputDeviceParams {
   // Unique identifier for the new device.
   int id;
 
   // Device path to open.
   base::FilePath path;
 
   // Callback for dispatching events. Call on UI thread only.
-  EventDispatchCallback dispatch_callback;
   KeyEventDispatchCallback key_callback;
   MouseMoveEventDispatchCallback mouse_move_callback;
   MouseButtonEventDispatchCallback mouse_button_callback;
+  MouseWheelEventDispatchCallback mouse_wheel_callback;
+  ScrollEventDispatchCallback scroll_callback;
   TouchEventDispatchCallback touch_callback;
 
   // State shared between devices. Must not be dereferenced on worker thread.
-  EventModifiersEvdev* modifiers;
   CursorDelegateEvdev* cursor;
 #if defined(USE_EVDEV_GESTURES)
   GesturePropertyProvider* gesture_property_provider;
 #endif
 };
 
 #if defined(USE_EVDEV_GESTURES)
 bool UseGesturesLibraryForDevice(const EventDeviceInfo& devinfo) {
   if (devinfo.HasTouchpad())
     return true;
 
   if (devinfo.HasRelXY())
     return true;  // mouse
 
   return false;
 }
 #endif
 
 scoped_ptr<EventConverterEvdev> CreateConverter(
     const OpenInputDeviceParams& params,
     int fd,
     InputDeviceType type,
     const EventDeviceInfo& devinfo) {
 #if defined(USE_EVDEV_GESTURES)
   // Touchpad or mouse: use gestures library.
   // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent
   if (UseGesturesLibraryForDevice(devinfo)) {
     scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp =
         make_scoped_ptr(new GestureInterpreterLibevdevCros(
-            params.id, params.modifiers, params.cursor,
-            params.gesture_property_provider, params.key_callback,
-            params.mouse_move_callback, params.mouse_button_callback,
-            params.dispatch_callback));
+            params.id, params.cursor, params.gesture_property_provider,
+            params.key_callback, params.mouse_move_callback,
+            params.mouse_button_callback, params.mouse_wheel_callback,
+            params.scroll_callback));
     return make_scoped_ptr(new EventReaderLibevdevCros(
         fd, params.path, params.id, type, devinfo, gesture_interp.Pass()));
   }
 #endif
 
   // Touchscreen: use TouchEventConverterEvdev.
   if (devinfo.HasMTAbsXY()) {
     scoped_ptr<TouchEventConverterEvdev> converter(new TouchEventConverterEvdev(
         fd, params.path, params.id, type, params.touch_callback));
     converter->Initialize(devinfo);
     return converter.Pass();
   }
 
   // Graphics tablet
   if (devinfo.HasAbsXY())
     return make_scoped_ptr<EventConverterEvdev>(new TabletEventConverterEvdev(
-        fd, params.path, params.id, type, params.modifiers, params.cursor,
-        devinfo, params.dispatch_callback));
+        fd, params.path, params.id, type, params.cursor, devinfo,
+        params.mouse_move_callback, params.mouse_button_callback));
 
   // Everything else: use EventConverterEvdevImpl.
   return make_scoped_ptr<EventConverterEvdevImpl>(new EventConverterEvdevImpl(
-      fd, params.path, params.id, type, devinfo, params.modifiers,
-      params.cursor, params.key_callback, params.mouse_move_callback,
+      fd, params.path, params.id, type, devinfo, params.cursor,
+      params.key_callback, params.mouse_move_callback,
       params.mouse_button_callback));
 }
 
 // Open an input device. Opening may put the calling thread to sleep, and
 // therefore should be run on a thread where latency is not critical. We
 // run it on a thread from the worker pool.
 //
 // This takes a TaskRunner and runs the reply on that thread, so that we
 // can hop threads if necessary (back to the UI thread).
 void OpenInputDevice(scoped_ptr<OpenInputDeviceParams> params,
@@ skipping 114 matching lines @@
   modifiers_.UpdateModifier(modifier, params.down);
 
   scoped_ptr<MouseEvent> event(new MouseEvent(
       params.down ? ui::ET_MOUSE_PRESSED : ui::ET_MOUSE_RELEASED,
       params.location, params.location, modifiers_.GetModifierFlags() | flag,
       /* changed_button_flags */ flag));
   event->set_source_device_id(params.device_id);
   PostUiEvent(event.Pass());
 }
 
+void EventFactoryEvdev::PostMouseWheelEvent(
+    const MouseWheelEventParams& params) {
+  scoped_ptr<MouseWheelEvent> event(new MouseWheelEvent(
+      params.delta, params.location, params.location,
+      modifiers_.GetModifierFlags(), 0 /* changed_button_flags */));
+  event->set_source_device_id(params.device_id);
+  PostUiEvent(event.Pass());
+}
+
+void EventFactoryEvdev::PostScrollEvent(const ScrollEventParams& params) {
+  scoped_ptr<ScrollEvent> event(new ScrollEvent(
+      params.type, params.location, params.timestamp,
+      modifiers_.GetModifierFlags(), params.delta.x(), params.delta.y(),
+      params.ordinal_delta.x(), params.ordinal_delta.y(), params.finger_count));
+  event->set_source_device_id(params.device_id);
+  PostUiEvent(event.Pass());
+}
+
 void EventFactoryEvdev::PostTouchEvent(const TouchEventParams& params) {
   float x = params.location.x();
   float y = params.location.y();
   double radius_x = params.radii.x();
   double radius_y = params.radii.y();
 
   // Transform the event to align touches to the image based on display mode.
   DeviceDataManager::GetInstance()->ApplyTouchTransformer(params.device_id, &x,
                                                           &y);
   DeviceDataManager::GetInstance()->ApplyTouchRadiusScale(params.device_id,
@@ skipping 45 matching lines @@
     return;
 
   switch (event.action_type()) {
     case DeviceEvent::ADD:
     case DeviceEvent::CHANGE: {
       TRACE_EVENT1("ozone", "OnDeviceAdded", "path", event.path().value());
 
       scoped_ptr<OpenInputDeviceParams> params(new OpenInputDeviceParams);
       params->id = NextDeviceId();
       params->path = event.path();
-      params->dispatch_callback = dispatch_callback_;
-      params->modifiers = &modifiers_;
       params->cursor = cursor_;
       params->key_callback = base::Bind(&EventFactoryEvdev::PostKeyEvent,
                                         weak_ptr_factory_.GetWeakPtr());
       params->mouse_move_callback =
           base::Bind(&EventFactoryEvdev::PostMouseMoveEvent,
                      weak_ptr_factory_.GetWeakPtr());
       params->mouse_button_callback =
           base::Bind(&EventFactoryEvdev::PostMouseButtonEvent,
                      weak_ptr_factory_.GetWeakPtr());
+      params->mouse_wheel_callback =
+          base::Bind(&EventFactoryEvdev::PostMouseWheelEvent,
+                     weak_ptr_factory_.GetWeakPtr());
+      params->scroll_callback = base::Bind(&EventFactoryEvdev::PostScrollEvent,
+                                           weak_ptr_factory_.GetWeakPtr());
       params->touch_callback = base::Bind(&EventFactoryEvdev::PostTouchEvent,
                                           weak_ptr_factory_.GetWeakPtr());
 
 #if defined(USE_EVDEV_GESTURES)
       params->gesture_property_provider = gesture_property_provider_.get();
 #endif
 
       OpenInputDeviceReplyCallback reply_callback =
           base::Bind(&EventFactoryEvdev::AttachInputDevice,
                      weak_ptr_factory_.GetWeakPtr());
@@ skipping 156 matching lines @@
   gesture_property_provider_->GetDeviceIdsByType(type, &ids);
 #endif
   // In the future we can add other device matching logics here.
 
   if (device_ids)
     device_ids->assign(ids.begin(), ids.end());
   return !ids.empty();
 }
 
 }  // namespace ui