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

ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.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/libgestures_glue/gesture_interpreter_libevdev_cros.h"
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/timer/timer.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
-#include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.h"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace ui {
 
 namespace {
 
 // Convert libevdev device class to libgestures device class.
@@ skipping 52 matching lines @@
 // Number of fingers for scroll gestures.
 const int kGestureScrollFingerCount = 2;
 
 // Number of fingers for swipe gestures.
 const int kGestureSwipeFingerCount = 3;
 
 }  // namespace
 
 GestureInterpreterLibevdevCros::GestureInterpreterLibevdevCros(
     int id,
-    EventModifiersEvdev* modifiers,
     CursorDelegateEvdev* cursor,
     GesturePropertyProvider* property_provider,
     const KeyEventDispatchCallback& key_callback,
     const MouseMoveEventDispatchCallback& mouse_move_callback,
     const MouseButtonEventDispatchCallback& mouse_button_callback,
-    const EventDispatchCallback& callback)
+    const MouseWheelEventDispatchCallback& mouse_wheel_callback,
+    const ScrollEventDispatchCallback& scroll_callback)
     : id_(id),
       is_mouse_(false),
-      modifiers_(modifiers),
       cursor_(cursor),
       property_provider_(property_provider),
       key_callback_(key_callback),
       mouse_move_callback_(mouse_move_callback),
       mouse_button_callback_(mouse_button_callback),
-      dispatch_callback_(callback),
+      mouse_wheel_callback_(mouse_wheel_callback),
+      scroll_callback_(scroll_callback),
       interpreter_(NULL),
       evdev_(NULL),
       device_properties_(new GestureDeviceProperties) {
   memset(&prev_key_state_, 0, sizeof(prev_key_state_));
 }
 
 GestureInterpreterLibevdevCros::~GestureInterpreterLibevdevCros() {
   // Note that this destructor got called after the evdev device node has been
   // closed. Therefore, all clean-up codes here shouldn't depend on the device
   // information (except for the pointer address itself).
@@ skipping 170 matching lines @@
   DVLOG(3) << base::StringPrintf("Gesture Scroll: (%f, %f) [%f, %f]",
                                  scroll->dx,
                                  scroll->dy,
                                  scroll->ordinal_dx,
                                  scroll->ordinal_dy);
   if (!cursor_)
     return;  // No cursor!
 
   // TODO(spang): Use scroll->start_time
   if (is_mouse_) {
-    Dispatch(make_scoped_ptr(new MouseWheelEvent(
-        gfx::Vector2d(scroll->dx, scroll->dy),
-        cursor_->GetLocation(),
-        cursor_->GetLocation(),
-        modifiers_->GetModifierFlags(),
-        0)));
+    mouse_wheel_callback_.Run(MouseWheelEventParams(
+        id_, cursor_->GetLocation(), gfx::Vector2d(scroll->dx, scroll->dy)));
   } else {
-    Dispatch(make_scoped_ptr(new ScrollEvent(
-        ET_SCROLL,
-        cursor_->GetLocation(),
-        StimeToTimedelta(gesture->end_time),
-        modifiers_->GetModifierFlags(),
-        scroll->dx,
-        scroll->dy,
-        scroll->ordinal_dx,
-        scroll->ordinal_dy,
-        kGestureScrollFingerCount)));
+    scroll_callback_.Run(ScrollEventParams(
+        id_, ET_SCROLL, cursor_->GetLocation(),
+        gfx::Vector2dF(scroll->dx, scroll->dy),
+        gfx::Vector2dF(scroll->ordinal_dx, scroll->ordinal_dy),
+        kGestureScrollFingerCount, StimeToTimedelta(gesture->end_time)));
   }
 }
 
 void GestureInterpreterLibevdevCros::OnGestureButtonsChange(
     const Gesture* gesture,
     const GestureButtonsChange* buttons) {
   DVLOG(3) << base::StringPrintf("Gesture Button Change: down=0x%02x up=0x%02x",
                                  buttons->down,
                                  buttons->up);
 
@@ skipping 31 matching lines @@
                   fling->fling_state);
 
   if (!cursor_)
     return;  // No cursor!
 
   EventType type =
       (fling->fling_state == GESTURES_FLING_START ? ET_SCROLL_FLING_START
                                                   : ET_SCROLL_FLING_CANCEL);
 
   // Fling is like 2-finger scrolling but with velocity instead of displacement.
-  Dispatch(make_scoped_ptr(new ScrollEvent(type,
-                                           cursor_->GetLocation(),
-                                           StimeToTimedelta(gesture->end_time),
-                                           modifiers_->GetModifierFlags(),
-                                           fling->vx,
-                                           fling->vy,
-                                           fling->ordinal_vx,
-                                           fling->ordinal_vy,
-                                           kGestureScrollFingerCount)));
+  scroll_callback_.Run(ScrollEventParams(
+      id_, type, cursor_->GetLocation(), gfx::Vector2dF(fling->vx, fling->vy),
+      gfx::Vector2dF(fling->ordinal_vx, fling->ordinal_vy),
+      kGestureScrollFingerCount, StimeToTimedelta(gesture->end_time)));
 }
 
 void GestureInterpreterLibevdevCros::OnGestureSwipe(const Gesture* gesture,
                                                     const GestureSwipe* swipe) {
   DVLOG(3) << base::StringPrintf("Gesture Swipe: (%f, %f) [%f, %f]",
                                  swipe->dx,
                                  swipe->dy,
                                  swipe->ordinal_dx,
                                  swipe->ordinal_dy);
 
   if (!cursor_)
     return;  // No cursor!
 
   // Swipe is 3-finger scrolling.
-  Dispatch(make_scoped_ptr(new ScrollEvent(ET_SCROLL,
-                                           cursor_->GetLocation(),
-                                           StimeToTimedelta(gesture->end_time),
-                                           modifiers_->GetModifierFlags(),
-                                           swipe->dx,
-                                           swipe->dy,
-                                           swipe->ordinal_dx,
-                                           swipe->ordinal_dy,
-                                           kGestureSwipeFingerCount)));
+  scroll_callback_.Run(ScrollEventParams(
+      id_, ET_SCROLL, cursor_->GetLocation(),
+      gfx::Vector2dF(swipe->dx, swipe->dy),
+      gfx::Vector2dF(swipe->ordinal_dx, swipe->ordinal_dy),
+      kGestureSwipeFingerCount, StimeToTimedelta(gesture->end_time)));
 }
 
 void GestureInterpreterLibevdevCros::OnGestureSwipeLift(
     const Gesture* gesture,
     const GestureSwipeLift* swipelift) {
   DVLOG(3) << base::StringPrintf("Gesture Swipe Lift");
 
   if (!cursor_)
     return;  // No cursor!
 
   // Turn a swipe lift into a fling start.
   // TODO(spang): Figure out why and put it in this comment.
 
-  Dispatch(make_scoped_ptr(new ScrollEvent(ET_SCROLL_FLING_START,
-                                           cursor_->GetLocation(),
-                                           StimeToTimedelta(gesture->end_time),
-                                           modifiers_->GetModifierFlags(),
-                                           /* x_offset */ 0,
-                                           /* y_offset */ 0,
-                                           /* x_offset_ordinal */ 0,
-                                           /* y_offset_ordinal */ 0,
-                                           kGestureScrollFingerCount)));
+  scroll_callback_.Run(ScrollEventParams(
+      id_, ET_SCROLL_FLING_START, cursor_->GetLocation(),
+      gfx::Vector2dF() /* delta */, gfx::Vector2dF() /* ordinal_delta */,
+      kGestureScrollFingerCount, StimeToTimedelta(gesture->end_time)));
 }
 
 void GestureInterpreterLibevdevCros::OnGesturePinch(const Gesture* gesture,
                                                     const GesturePinch* pinch) {
   DVLOG(3) << base::StringPrintf(
                   "Gesture Pinch: dz=%f [%f]", pinch->dz, pinch->ordinal_dz);
 
   if (!cursor_)
     return;  // No cursor!
 
   NOTIMPLEMENTED();
 }
 
 void GestureInterpreterLibevdevCros::OnGestureMetrics(
     const Gesture* gesture,
     const GestureMetrics* metrics) {
   DVLOG(3) << base::StringPrintf("Gesture Metrics: [%f, %f] type=%d",
                                  metrics->data[0],
                                  metrics->data[1],
                                  metrics->type);
   NOTIMPLEMENTED();
 }
 
-void GestureInterpreterLibevdevCros::Dispatch(scoped_ptr<Event> event) {
-  dispatch_callback_.Run(event.Pass());
-}
-
 void GestureInterpreterLibevdevCros::DispatchMouseButton(unsigned int button,
                                                          bool down) {
   bool allow_remap = is_mouse_;
   mouse_button_callback_.Run(MouseButtonEventParams(id_, cursor_->GetLocation(),
                                                     button, down, allow_remap));
 }
 
 void GestureInterpreterLibevdevCros::DispatchChangedKeys(Evdev* evdev,
                                                          const timeval& time) {
   unsigned long key_state_diff[EVDEV_BITS_TO_LONGS(KEY_CNT)];
@@ skipping 22 matching lines @@
       key_callback_.Run(KeyEventParams(id_, key, value));
     }
   }
 
   // Update internal key state.
   for (unsigned long i = 0; i < EVDEV_BITS_TO_LONGS(KEY_CNT); ++i)
     prev_key_state_[i] = evdev->key_state_bitmask[i];
 }
 
 }  // namespace ui