From 60e031b4aeb02001a00658b2a40901e3f0537bd2 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 10 Oct 2017 15:13:55 +0200
Subject: [PATCH] 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>
---
src/3rdparty | 2 +-
src/core/chromium_overrides.cpp | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 1f8630df0..3d02dd98f 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 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;
--
GitLab