summaryrefslogtreecommitdiffstats
path: root/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
diff options
context:
space:
mode:
authorNick Diego Yamane <nickdiego@igalia.com>2019-08-14 22:35:41 +0000
committerMichal Klocek <michal.klocek@qt.io>2019-10-11 12:28:29 +0000
commit580ffe2cb7500a210ec7e10ad312f45fb1152572 (patch)
treee7d338712ffde16cdd5f45160469bd8a869d6b90 /chromium/ui/events/ozone/evdev/event_converter_evdev.cc
parent6a5dc3af353796d7075f0b41d611f88ba3c9f1c8 (diff)
[Backport] Reintroduce glib event loop 2/3
Make it possible to use glib message pump in Ozone Ozone implementation assumes libevent MessagePump is used (more specifically, MessagePumpLibevent and X11EventSourceLibevent are directly referenced), which makes it impossible to build/run ozone-based builds with use_glib=true. This CL changes it, making use mainly of Message{Pump,Loop}CurrentFor{UI,IO} APIs. The main motivation for this is to bring up glib MessagePump/EventSource in ozone/x11 UI thread, which is part of the effort to migrate away from Aura/X11 to Ozone in Linux desktop. So, with this change, use_glib can be set to true when configuring ozone/linux builds. Additionally, X11EventSourceLibevent is renamed (as it is not libevent-specific anymore). Also, from now on it will be possible to start XEvent => ui::Event migration in Aura/X11, reducing even more the delta between ozone and non-ozone X11. A preliminary step towards that is done in this CL, which consists of moving XEventDispatcher API out of X11EventSourceDelegate into X11EventSource, so that its consumers should not use delegate implementation to register/unregister |XEventDispatcher|s anymore, thus making delegate implementation more like an internal detail, at some point it might makes sense to merge delegate impl into X11EventSource and even move it into ozone/x11 layer. Bug: 988094, 789065 Change-Id: I46c38aa26475ae8f3f89ef0c632d4c8ffb76fd7c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/events/ozone/evdev/event_converter_evdev.cc')
-rw-r--r--chromium/ui/events/ozone/evdev/event_converter_evdev.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
index 8f9bebfa0f7..684514ff011 100644
--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
@@ -45,7 +45,7 @@ EventConverterEvdev::~EventConverterEvdev() {
void EventConverterEvdev::Start() {
base::MessageLoopCurrentForUI::Get()->WatchFileDescriptor(
- fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
+ fd_, true, base::MessagePumpForUI::WATCH_READ, &controller_, this);
watching_ = true;
}