Adaptations for Chromium 73

Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

4 files changed, 50 insertions, 6 deletions

diff --git a/src/core/ozone/BUILD.gn b/src/core/ozone/BUILD.gn
new file mode 100644
index 000000000..b96d8a47a
--- /dev/null
+++ b/src/core/ozone/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("qt") {
+  sources = [
+    "ozone_platform_qt.h",
+    "ozone_platform_qt.cpp",
+  ]
+
+  import("//ui/base/ui_features.gni")
+  import("//ui/gl/features.gni")
+
+  deps = [
+    "//base",
+    "//ui/ozone:ozone_base",
+    "//ui/ozone/common",
+  ]
+
+  defines = [ "OZONE_IMPLEMENTATION" ]
+
+  if (is_linux && !is_desktop_linux) {
+    deps += [ "//ui/events/ozone:events_ozone_evdev"]
+  }
+}
diff --git a/src/core/ozone/ozone_extra.gni b/src/core/ozone/ozone_extra.gni
new file mode 100644
index 000000000..a832f741a
--- /dev/null
+++ b/src/core/ozone/ozone_extra.gni
@@ -0,0 +1,19 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This list contains the name of external platforms that are passed to the
+# --ozone-platform command line argument or used for the ozone_platform build
+# config. For example ozone_external_platforms = [ "foo1", "foo2", ... ]
+ozone_external_platforms = [ "qt" ]
+
+# This list contains dependencies for external platforms. Typically, the Ozone
+# implementations are placed into ui/ozone/platform/ and so this will look
+# something like:
+# ozone_external_platform_deps = [ "platform/foo1", "platform/foo_2", ... ]
+ozone_external_platform_deps = []
+
+# If a platform has unit tests, the corresponding source_set can be listed here
+# so that they get included into ozone_unittests.
+# ozone_external_platform_test_deps = [ "platform/foo1:foo1_unitests", ... ]
+ozone_external_platform_test_deps = []
diff --git a/src/core/ozone/ozone_platform_qt.cpp b/src/core/ozone/ozone_platform_qt.cpp
index 1115f3fac..eb7610c0f 100644
--- a/src/core/ozone/ozone_platform_qt.cpp
+++ b/src/core/ozone/ozone_platform_qt.cpp
@@ -37,11 +37,9 @@
 **
 ****************************************************************************/
 
-#include "ozone/ozone_platform_qt.h"
+#include "ozone_platform_qt.h"
 
 #if defined(USE_OZONE)
-#include "ozone/surface_factory_qt.h"
-#include "ozone/platform_window_qt.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/events/system_input_injector.h"
 #include "ui/ozone/common/stub_client_native_pixmap_factory.h"
@@ -54,6 +52,9 @@
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "ui/platform_window/platform_window.h"
 
+#include "surface_factory_qt.h"
+#include "platform_window_qt.h"
+
 namespace ui {
 
 namespace {
diff --git a/src/core/ozone/surface_factory_qt.cpp b/src/core/ozone/surface_factory_qt.cpp
index 9570852c9..5420b4809 100644
--- a/src/core/ozone/surface_factory_qt.cpp
+++ b/src/core/ozone/surface_factory_qt.cpp
@@ -38,10 +38,9 @@
 ****************************************************************************/
 
 #include "surface_factory_qt.h"
-#include "qtwebenginecoreglobal_p.h"
 #include "gl_context_qt.h"
 #include "gl_ozone_egl_qt.h"
-#if QT_CONFIG(webengine_system_x11)
+#if defined(USE_GLX)
 #include "gl_ozone_glx_qt.h"
 #endif
 
@@ -58,7 +57,7 @@ namespace QtWebEngineCore {
 SurfaceFactoryQt::SurfaceFactoryQt()
 {
     Q_ASSERT(qApp);
-#if QT_CONFIG(webengine_system_x11)
+#if defined(USE_GLX)
     if (GLContextHelper::getGlXConfig()) {
         m_impl = gl::kGLImplementationDesktopGL;
         m_ozone.reset(new ui::GLOzoneGLXQt());