diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-10 15:13:55 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-18 21:26:19 +0000 |
| commit | 60e031b4aeb02001a00658b2a40901e3f0537bd2 (patch) | |
| tree | 0e264c69c09d8b067e69120b39971806629cbfaa /src/core/chromium_overrides.cpp | |
| parent | 1a49e5784646d088c7f459492ed83e2c2bf951d4 (diff) | |
Update Chromium
Add dummy override for input-event source on X11, which we now
comment out in Chromium to avoid it talking to X11 directly.
Changes:
7b8aa9b87a Fix not working bug black lists
cea17a5763 Do not export .gitignore and .gitattributes
260f8350e1 Fix Chromium built with X11 running without
42d8ea5645 FIXUP: Fix build with GCC 7.0
3d02dd98fb Use basic collection info only on linux
Task-number: QTBUG-55384
Change-Id: Ifcd0f39578d608b93687b869db2bbcc5c0a03fde
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 9aeeb1327..8e19fa08f 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -49,6 +49,8 @@ #include "content/common/font_list.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" +#include "ui/events/devices/device_data_manager.h" +#include "ui/events/platform/platform_event_source.h" #include "ppapi/features/features.h" #include <QGuiApplication> @@ -97,7 +99,21 @@ XDisplay* GetQtXDisplay() { return static_cast<XDisplay*>(GLContextHelper::getXDisplay()); } -#endif + +namespace ui { +class DummyPlatformEventSource : public PlatformEventSource +{ +public: + DummyPlatformEventSource() { + DeviceDataManager::CreateInstance(); + } +}; + +std::unique_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() { + return base::MakeUnique<DummyPlatformEventSource>(); +} +} // namespace ui +#endif // defined(USE_X11) namespace content { class WebContentsImpl; |