[PATCH 5/11] ozone: evdev: Replace dispatch callbacks with an interface

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/device_event_dispatcher_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/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 {
@@ skipping 56 matching lines @@
 
 // Number of fingers for swipe gestures.
 const int kGestureSwipeFingerCount = 3;
 
 }  // namespace
 
 GestureInterpreterLibevdevCros::GestureInterpreterLibevdevCros(
     int id,
     CursorDelegateEvdev* cursor,
     GesturePropertyProvider* property_provider,
-    const KeyEventDispatchCallback& key_callback,
-    const MouseMoveEventDispatchCallback& mouse_move_callback,
-    const MouseButtonEventDispatchCallback& mouse_button_callback,
-    const MouseWheelEventDispatchCallback& mouse_wheel_callback,
-    const ScrollEventDispatchCallback& scroll_callback)
+    DeviceEventDispatcherEvdev* dispatcher)
     : id_(id),
       is_mouse_(false),
       cursor_(cursor),
       property_provider_(property_provider),
-      key_callback_(key_callback),
-      mouse_move_callback_(mouse_move_callback),
-      mouse_button_callback_(mouse_button_callback),
-      mouse_wheel_callback_(mouse_wheel_callback),
-      scroll_callback_(scroll_callback),
+      dispatcher_(dispatcher),
       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 154 matching lines @@
                                  move->dx,
                                  move->dy,
                                  move->ordinal_dx,
                                  move->ordinal_dy);
   if (!cursor_)
     return;  // No cursor!
 
   cursor_->MoveCursor(gfx::Vector2dF(move->dx, move->dy));
   // TODO(spang): Use move->ordinal_dx, move->ordinal_dy
   // TODO(spang): Use move->start_time, move->end_time
-  mouse_move_callback_.Run(MouseMoveEventParams(id_, cursor_->GetLocation()));
+  dispatcher_->DispatchMouseMoveEvent(
+      MouseMoveEventParams(id_, cursor_->GetLocation()));
 }
 
 void GestureInterpreterLibevdevCros::OnGestureScroll(
     const Gesture* gesture,
     const GestureScroll* scroll) {
   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_) {
-    mouse_wheel_callback_.Run(MouseWheelEventParams(
+    dispatcher_->DispatchMouseWheelEvent(MouseWheelEventParams(
         id_, cursor_->GetLocation(), gfx::Vector2d(scroll->dx, scroll->dy)));
   } else {
-    scroll_callback_.Run(ScrollEventParams(
+    dispatcher_->DispatchScrollEvent(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) {
@@ skipping 35 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.
-  scroll_callback_.Run(ScrollEventParams(
+  dispatcher_->DispatchScrollEvent(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.
-  scroll_callback_.Run(ScrollEventParams(
+  dispatcher_->DispatchScrollEvent(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.
 
-  scroll_callback_.Run(ScrollEventParams(
+  dispatcher_->DispatchScrollEvent(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::DispatchMouseButton(unsigned int button,
                                                          bool down) {
   bool allow_remap = is_mouse_;
-  mouse_button_callback_.Run(MouseButtonEventParams(id_, cursor_->GetLocation(),
-                                                    button, down, allow_remap));
+  dispatcher_->DispatchMouseButtonEvent(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)];
 
   // Find changed keys.
   for (unsigned long i = 0; i < arraysize(key_state_diff); ++i)
     key_state_diff[i] = evdev->key_state_bitmask[i] ^ prev_key_state_[i];
 
   // Dispatch events for changed keys.
   for (unsigned long key = 0; key < KEY_CNT; ++key) {
     if (EvdevBitIsSet(key_state_diff, key)) {
       bool value = EvdevBitIsSet(evdev->key_state_bitmask, key);
 
       // Mouse buttons are handled by DispatchMouseButton.
       if (key >= BTN_MOUSE && key < BTN_JOYSTICK)
         continue;
 
       // Ignore digi buttons (e.g. BTN_TOOL_FINGER).
       if (key >= BTN_DIGI && key < BTN_WHEEL)
         continue;
 
       if (allowed_keys_ && !allowed_keys_->count(key))
         continue;
 
       // Dispatch key press or release to keyboard.
-      key_callback_.Run(KeyEventParams(id_, key, value));
+      dispatcher_->DispatchKeyEvent(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