Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: ui/events/ozone/evdev/event_factory_evdev.cc

Issue 545063006: ozone: evdev: Add gesture property provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the code again. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/evdev/event_factory_evdev.cc
diff --git a/ui/events/ozone/evdev/event_factory_evdev.cc b/ui/events/ozone/evdev/event_factory_evdev.cc
index 5499339b5d40911d5d889a1cca7439999ccac81f..933ed9b2b27cbb780241c9817a4b083aea572609 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.cc
+++ b/ui/events/ozone/evdev/event_factory_evdev.cc
@@ -23,6 +23,7 @@
#if defined(USE_EVDEV_GESTURES)
#include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h"
#include "ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h"
+#include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
#endif
#ifndef EVIOCSCLOCKID
@@ -49,6 +50,7 @@ struct OpenInputDeviceParams {
// State shared between devices. Must not be dereferenced on worker thread.
EventModifiersEvdev* modifiers;
CursorDelegateEvdev* cursor;
+ GesturePropertyProvider* gesture_property_provider;
};
#if defined(USE_EVDEV_GESTURES)
@@ -71,9 +73,12 @@ scoped_ptr<EventConverterEvdev> CreateConverter(
// Touchpad or mouse: use gestures library.
// EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent
if (UseGesturesLibraryForDevice(devinfo)) {
- scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp =
- make_scoped_ptr(new GestureInterpreterLibevdevCros(
- params.modifiers, params.cursor, params.dispatch_callback));
+ scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp = make_scoped_ptr(
+ new GestureInterpreterLibevdevCros(params.id,
+ params.modifiers,
+ params.cursor,
+ params.gesture_property_provider,
+ params.dispatch_callback));
return make_scoped_ptr(new EventReaderLibevdevCros(
fd, params.path, params.id, gesture_interp.Pass()));
}
@@ -147,6 +152,9 @@ EventFactoryEvdev::EventFactoryEvdev(CursorDelegateEvdev* cursor,
: last_device_id_(0),
device_manager_(device_manager),
cursor_(cursor),
+#if defined(USE_EVDEV_GESTURES)
+ gesture_property_provider_(new GesturePropertyProvider),
+#endif
dispatch_callback_(
base::Bind(base::IgnoreResult(&EventFactoryEvdev::DispatchUiEvent),
base::Unretained(this))),
@@ -194,6 +202,7 @@ void EventFactoryEvdev::OnDeviceEvent(const DeviceEvent& event) {
params->dispatch_callback = dispatch_callback_;
params->modifiers = &modifiers_;
params->cursor = cursor_;
+ params->gesture_property_provider = gesture_property_provider_.get();
OpenInputDeviceReplyCallback reply_callback =
base::Bind(&EventFactoryEvdev::AttachInputDevice,

Powered by Google App Engine
This is Rietveld 408576698