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

Unified Diff: ui/events/devices/x11/device_list_cache_x11.cc

Issue 1287103004: Sync ui/events to chromium @ https://codereview.chromium.org/1210203002 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 4 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
« no previous file with comments | « ui/events/devices/x11/device_list_cache_x11.h ('k') | ui/events/devices/x11/touch_factory_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/device_list_cache_x11.cc
diff --git a/ui/events/devices/x11/device_list_cache_x11.cc b/ui/events/devices/x11/device_list_cache_x11.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ffab2ea9a98f1b02d149cc27658c97308bbaefa1
--- /dev/null
+++ b/ui/events/devices/x11/device_list_cache_x11.cc
@@ -0,0 +1,67 @@
+// Copyright (c) 2012 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/devices/x11/device_list_cache_x11.h"
+
+#include <algorithm>
+
+#include "base/memory/singleton.h"
+#include "base/message_loop/message_loop.h"
+#include "ui/events/devices/x11/device_data_manager_x11.h"
+
+namespace {
+
+bool IsXI2Available() {
+#if defined(USE_AURA)
+ return ui::DeviceDataManagerX11::GetInstance()->IsXInput2Available();
+#else
+ return false;
+#endif
+}
+
+}
+
+namespace ui {
+
+DeviceListCacheX11::DeviceListCacheX11() {
+}
+
+DeviceListCacheX11::~DeviceListCacheX11() {
+}
+
+DeviceListCacheX11* DeviceListCacheX11::GetInstance() {
+ return Singleton<DeviceListCacheX11>::get();
+}
+
+void DeviceListCacheX11::UpdateDeviceList(Display* display) {
+ XDeviceList& new_x_dev_list = x_dev_list_;
+ new_x_dev_list.devices.reset(
+ XListInputDevices(display, &new_x_dev_list.count));
+
+ XIDeviceList& new_xi_dev_list = xi_dev_list_;
+ new_xi_dev_list.devices.reset(
+ IsXI2Available()
+ ? XIQueryDevice(display, XIAllDevices, &new_xi_dev_list.count)
+ : nullptr);
+}
+
+const XDeviceList& DeviceListCacheX11::GetXDeviceList(Display* display) {
+ XDeviceList& x_dev_list = x_dev_list_;
+ // Note that the function can be called before any update has taken place.
+ if (!x_dev_list.devices && !x_dev_list.count)
+ x_dev_list.devices.reset(XListInputDevices(display, &x_dev_list.count));
+ return x_dev_list;
+}
+
+const XIDeviceList& DeviceListCacheX11::GetXI2DeviceList(Display* display) {
+ XIDeviceList& xi_dev_list = xi_dev_list_;
+ if (!xi_dev_list.devices && !xi_dev_list.count) {
+ xi_dev_list.devices.reset(
+ XIQueryDevice(display, XIAllDevices, &xi_dev_list.count));
+ }
+ return xi_dev_list;
+}
+
+} // namespace ui
+
« no previous file with comments | « ui/events/devices/x11/device_list_cache_x11.h ('k') | ui/events/devices/x11/touch_factory_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698