diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-07-25 17:25:47 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:05:48 +0200 |
| commit | c63998535d3add533e05ec4efa85f4fc7e34700c (patch) | |
| tree | bf4a929920061b8179c93f810c2da2caf73060ac | |
| parent | d006bbb41d3e5ac3c96cdbf570acd6a2691baa1a (diff) | |
| download | qtwebengine-chromium-c63998535d3add533e05ec4efa85f4fc7e34700c.tar.gz | |
<chromium> 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.
Change-Id: Ib7bb4fb1fc8692df1b8151c3d159de3d0f73076f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | chromium/ui/events/event.cc | 14 | ||||
| -rw-r--r-- | chromium/ui/ui.gyp | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/chromium/content/content_browser.gypi b/chromium/content/content_browser.gypi index 99cc728c4ea..b0f963c4bb0 100644 --- a/chromium/content/content_browser.gypi +++ b/chromium/content/content_browser.gypi @@ -1547,7 +1547,7 @@ ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], ], }], - ['use_aura!=1 and OS!="win"', { + ['use_aura!=1 and use_qt!=1 and OS!="win"', { 'sources!': [ 'browser/renderer_host/ui_events_helper.cc', 'browser/renderer_host/ui_events_helper.h', diff --git a/chromium/ui/events/event.cc b/chromium/ui/events/event.cc index 246e39721f2..39d2b9a57f9 100644 --- a/chromium/ui/events/event.cc +++ b/chromium/ui/events/event.cc @@ -273,7 +273,13 @@ void LocatedEvent::UpdateForRootTransform( MouseEvent::MouseEvent(const base::NativeEvent& native_event) : LocatedEvent(native_event), changed_button_flags_( - GetChangedMouseButtonFlagsFromNative(native_event)) { +// GetChangedMouseButtonFlagsFromNative isn't implemented on Mac. MouseEvent shouldn't be used. +#if !defined(OS_MACOSX) + GetChangedMouseButtonFlagsFromNative(native_event) +#else + 0 +#endif + ) { if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED) SetClickCount(GetRepeatCount(*this)); } @@ -638,6 +644,8 @@ void TranslatedKeyEvent::ConvertToKeyEvent() { ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) : MouseEvent(native_event) { +// GetScrollOffsets and GetFlingData aren't implemented on Mac. ScrollEvent shouldn't be used. +#if !defined(OS_MACOSX) if (type() == ET_SCROLL) { GetScrollOffsets(native_event, &x_offset_, &y_offset_, @@ -649,7 +657,9 @@ ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) &x_offset_, &y_offset_, &x_offset_ordinal_, &y_offset_ordinal_, NULL); - } else { + } else +#endif + { NOTREACHED() << "Unexpected event type " << type() << " when constructing a ScrollEvent."; } diff --git a/chromium/ui/ui.gyp b/chromium/ui/ui.gyp index 5d61dc44043..aa0f3be2fb6 100644 --- a/chromium/ui/ui.gyp +++ b/chromium/ui/ui.gyp @@ -350,7 +350,7 @@ ], }, }], - ['toolkit_views==1', { + ['toolkit_views==1 or use_qt==1', { 'dependencies': [ 'events/events.gyp:events', ], |