1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From f6f4790eba13beb53ee0a1e169fd75e04ec9eefa Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 25 Jul 2013 17:25:47 +0200
Subject: [PATCH] Build files necessary for touch and gestures.
Also guard the use of MessagePumpAuraX11 in events_x.cc. We need to
build it to get symbols depending on base::NativeEvent.
---
content/content_browser.gypi | 2 +-
ui/base/x/events_x.cc | 4 ++++
ui/ui.gyp | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index b3751ac..3597da6 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1441,7 +1441,7 @@
['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'],
],
}],
- ['use_aura!=1 and OS!="win"', {
+ ['use_aura!=1 and use_qt!=1 and OS!="win"', {
'sources!': [
'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc',
'browser/renderer_host/ui_events_helper.cc',
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index 03d4ae2..5152168 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -275,7 +275,11 @@ double GetTouchParamFromXEvent(XEvent* xev,
Atom GetNoopEventAtom() {
return XInternAtom(
+#if defined(USE_AURA)
base::MessagePumpAuraX11::GetDefaultXDisplay(),
+#else
+ XOpenDisplay(NULL),
+#endif
"noop", False);
}
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e17d242..d4897cc 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -694,7 +694,7 @@
['exclude', 'base/dragdrop/drag_utils_aura.cc'],
],
}],
- ['use_aura==0 and toolkit_views==0', {
+ ['use_aura==0 and use_qt==0 and toolkit_views==0', {
'sources/': [
['exclude', '^base/gestures/*'],
]
@@ -866,7 +866,7 @@
'base/cursor/cursor_loader_null.h',
],
}],
- ['toolkit_views==0', {
+ ['use_qt==0 and toolkit_views==0', {
'sources!': [
'base/events/event.cc',
'base/events/event.h',
--
1.7.12.4 (Apple Git-37)
|
