diff --git a/src/3rdparty b/src/3rdparty index 1f8630df0b982e344aac5c5f1faadf647255ecb5..3d02dd98fb1928c0c92d3ca4d67c2baeca4aece1 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 1f8630df0b982e344aac5c5f1faadf647255ecb5 +Subproject commit 3d02dd98fb1928c0c92d3ca4d67c2baeca4aece1 diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 9aeeb13272eb71586ec500773f7cb3f507da9ba7..8e19fa08f8170c289602d9b00819ce0479e94e3f 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;