summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------src/3rdparty0
-rw-r--r--src/core/chromium_overrides.cpp18
2 files changed, 17 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 1f8630df0b982e344aac5c5f1faadf647255ecb
+Subproject 3d02dd98fb1928c0c92d3ca4d67c2baeca4aece
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;