Qt GN integration

Exclude source files we override in the qt webengine sources.

Change-Id: I79925220265602bd0c39e5e03162cf1dca15befe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

20 files changed, 150 insertions, 21 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index d06fa5eec39..4016d0415ad 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -755,7 +755,7 @@ if (is_fuchsia) {
 
 # TODO(GYP_GONE): Figure out if we really need this target or if there's
 # some better way to specify things.
-if (is_win) {
+if (is_win && !use_qt) {
   group("chrome_official_builder_no_unittests") {
     deps = [
       "//chrome/common/win:eventlog_provider",
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index cbd015f9a0a..768da3298af 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -11,6 +11,9 @@ import("//build/toolchain/cc_wrapper.gni")
 import("//build/toolchain/toolchain.gni")
 import("//build_overrides/build.gni")
 
+# Import features.gni for the "use_qt" argument to be available.
+import("//build/config/features.gni")
+
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
@@ -253,6 +256,12 @@ config("compiler") {
     }
   }
 
+  if (use_qt && is_clang) {
+    cflags += [
+      "-Wno-unknown-warning-option"
+    ]
+  }
+
   if (is_clang && is_debug) {
     # Allow comparing the address of references and 'this' against 0
     # in debug builds. Technically, these can never be null in
diff --git a/chromium/build/config/linux/pangocairo/pangocairo.gni b/chromium/build/config/linux/pangocairo/pangocairo.gni
index ca99445b967..92d32e0f449 100644
--- a/chromium/build/config/linux/pangocairo/pangocairo.gni
+++ b/chromium/build/config/linux/pangocairo/pangocairo.gni
@@ -4,4 +4,4 @@
 
 import("//build/config/ui.gni")
 
-use_pangocairo = is_linux && !use_ozone
+use_pangocairo = use_gtk
diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index 949e09f7b26..465dd03337a 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -18,6 +18,7 @@
 # of //build/config/BUILDCONFIG.gn.
 
 import("//build/config/chromecast_build.gni")
+import("//build/config/features.gni")
 
 declare_args() {
   # Indicates if Ash is enabled. Ash is the Aura Shell which provides a
@@ -51,13 +52,17 @@ declare_args() {
 # Indicates if the UI toolkit depends on X11.
 use_x11 = is_linux && !use_ozone
 
+# Indicates if the UI toolkit depends on GTK.
+use_gtk = use_x11 && !use_qt
+
 # Turn off glib if Ozone is enabled.
 if (use_ozone) {
   use_glib = false
 }
 
 # Whether to use atk, the Accessibility ToolKit library
-use_atk = is_desktop_linux && use_x11
+use_atk = is_desktop_linux && use_gtk
+
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
diff --git a/chromium/chrome/tools/convert_dict/BUILD.gn b/chromium/chrome/tools/convert_dict/BUILD.gn
index 5e67d393956..d210e2b7607 100644
--- a/chromium/chrome/tools/convert_dict/BUILD.gn
+++ b/chromium/chrome/tools/convert_dict/BUILD.gn
@@ -34,7 +34,7 @@ if (use_qt) {
       ":lib",
       "//base",
       "//base:i18n",
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
       "//third_party/hunspell",
     ]
   }
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index dfffabe1170..2a1d3041bd4 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -2264,6 +2264,45 @@ source_set("browser") {
       "hyphenation/hyphenation_impl.h",
     ]
   }
+
+  if (use_qt) {
+    if (is_win) {
+      sources -= [
+        "accessibility/browser_accessibility_com_win.cc",
+        "accessibility/browser_accessibility_com_win.h",
+        "accessibility/browser_accessibility_event_win.cc",
+        "accessibility/browser_accessibility_event_win.h",
+        "accessibility/browser_accessibility_manager_win.cc",
+        "accessibility/browser_accessibility_manager_win.h",
+        "accessibility/browser_accessibility_win.cc",
+        "accessibility/browser_accessibility_win.h",
+      ]
+    }
+    if (use_aura) {
+      sources -= [
+        "renderer_host/native_web_keyboard_event_aura.cc",
+        "renderer_host/render_widget_host_view_aura.cc",
+        "renderer_host/render_widget_host_view_aura.h",
+        "web_contents/web_contents_view_aura.h",
+        "web_contents/web_contents_view_aura.cc",
+      ]
+    } else if (is_mac) {
+      sources -= [
+        "accessibility/accessibility_tree_formatter_mac.mm",
+        "accessibility/browser_accessibility_cocoa.mm",
+        "accessibility/browser_accessibility_cocoa.h",
+        "accessibility/browser_accessibility_mac.mm",
+        "accessibility/browser_accessibility_mac.h",
+        "accessibility/browser_accessibility_manager_mac.mm",
+        "accessibility/browser_accessibility_manager_mac.h",
+        "renderer_host/native_web_keyboard_event_mac.mm",
+        "renderer_host/render_widget_host_view_mac.mm",
+        "renderer_host/render_widget_host_view_mac.h",
+        "web_contents/web_contents_view_mac.mm",
+        "web_contents/web_contents_view_mac.h",
+      ]
+    }
+  }
 }
 
 buildflag_header("accessibility_flags") {
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index d607aae096c..5a97f68b810 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -515,11 +515,9 @@ source_set("common") {
     sources -= [ "cursors/webcursor_aurax11.cc" ]
   }
 
-  if (is_linux) {
+  if (is_linux && !use_qt) {
     deps += [ "//third_party/fontconfig" ]
-  }
-
-  if (is_mac || is_win || is_android || is_fuchsia) {
+  } else {
     sources -= [ "font_list_fontconfig.cc" ]
   }
 
diff --git a/chromium/device/bluetooth/BUILD.gn b/chromium/device/bluetooth/BUILD.gn
index e0d141b2df2..fb324999140 100644
--- a/chromium/device/bluetooth/BUILD.gn
+++ b/chromium/device/bluetooth/BUILD.gn
@@ -228,7 +228,8 @@ component("bluetooth") {
   }
 
   if (is_chromeos || is_linux) {
-    if (use_dbus) {
+    if (use_dbus && is_chromeos) {
+      # This crap uses ChromeOS specific system API
       sources += [
         "bluez/bluetooth_adapter_bluez.cc",
         "bluez/bluetooth_adapter_bluez.h",
diff --git a/chromium/gpu/ipc/service/BUILD.gn b/chromium/gpu/ipc/service/BUILD.gn
index 983715b6773..9d3d98b884c 100644
--- a/chromium/gpu/ipc/service/BUILD.gn
+++ b/chromium/gpu/ipc/service/BUILD.gn
@@ -88,6 +88,12 @@ target(link_target_type, "ipc_service_sources") {
       "direct_composition_surface_win.h",
       "image_transport_surface_win.cc",
     ]
+    if (use_qt) {
+      sources -= [
+        "direct_composition_surface_win.cc",
+        "direct_composition_surface_win.h",
+      ]
+    }
     libs += [ "dwmapi.lib" ]
   }
   if (is_mac) {
diff --git a/chromium/gpu/ipc/service/gpu_init.cc b/chromium/gpu/ipc/service/gpu_init.cc
index d799b62552f..575fa64a2f4 100644
--- a/chromium/gpu/ipc/service/gpu_init.cc
+++ b/chromium/gpu/ipc/service/gpu_init.cc
@@ -30,7 +30,7 @@
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 #include "gpu/ipc/service/direct_composition_surface_win.h"
 #endif
 
@@ -62,7 +62,7 @@ void CollectGraphicsInfo(GPUInfo* gpu_info) {
       break;
   }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 &&
       gl::GLSurfaceEGL::IsDirectCompositionSupported() &&
       DirectCompositionSurfaceWin::AreOverlaysSupported()) {
diff --git a/chromium/third_party/WebKit/Source/build/scripts/scripts.gni b/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
index e6789efa3f7..327923530cc 100644
--- a/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
+++ b/chromium/third_party/WebKit/Source/build/scripts/scripts.gni
@@ -64,8 +64,13 @@ make_trie_helpers_files =
 # The executables are relative to the build directory. Don't rebase it because
 # on Posix we want to run the system one on the path.
 if (host_os == "win") {
-  gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
-  bison_exe = rebase_path("//third_party/bison/bin/bison.exe", root_build_dir)
+  if (use_qt) {
+    gperf_exe = "gperf.exe"
+    bison_exe = "bison.exe"
+  } else {
+    gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
+    bison_exe = rebase_path("//third_party/bison/bin/bison.exe", root_build_dir)
+  }
 } else {
   gperf_exe = "gperf"
   bison_exe = "bison"
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index de79df2eaa7..06c394597ab 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -615,12 +615,12 @@ component("base") {
 
   if (use_aura) {
     # Aura clipboard.
-    if (use_x11 && is_desktop_linux) {
+    if (use_x11 && is_desktop_linux && !use_qt) {
       sources += [
         "clipboard/clipboard_aurax11.cc",
         "clipboard/clipboard_aurax11.h",
       ]
-    } else if (!is_win) {
+    } else if (!is_win && !use_qt) {
       # This file is used for all non-X11, non-Windows aura Builds.
       sources += [
         "clipboard/clipboard_aura.cc",
@@ -640,6 +640,39 @@ component("base") {
   if (is_android || is_ios) {
     sources -= [ "device_form_factor_desktop.cc" ]
   }
+
+  if (use_qt) {
+    if (is_linux) {
+      sources -= [
+        "resource/resource_bundle_auralinux.cc",
+      ]
+      if (use_x11) {
+        sources -= [
+          "dragdrop/os_exchange_data_provider_aurax11.cc",
+          "dragdrop/os_exchange_data_provider_aurax11.h",
+        ]
+      }
+    } else if (is_mac) {
+      sources -= [
+        "clipboard/clipboard_mac.mm",
+        "clipboard/clipboard_mac.h",
+        "dragdrop/os_exchange_data_provider_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.h",
+        "resource/resource_bundle_mac.mm",
+      ]
+    } else if (is_win) {
+      sources -= [
+        "clipboard/clipboard_util_win.cc",
+        "clipboard/clipboard_util_win.h",
+        "clipboard/clipboard_win.cc",
+        "clipboard/clipboard_win.h",
+        "dragdrop/os_exchange_data_provider_win.cc",
+        "dragdrop/os_exchange_data_provider_win.h",
+        "resource/resource_bundle_win.cc",
+        "resource/resource_bundle_win.h",
+      ]
+    }
+  }
 }
 
 static_library("test_support") {
diff --git a/chromium/ui/gfx/BUILD.gn b/chromium/ui/gfx/BUILD.gn
index 862de17f123..257ef472dcc 100644
--- a/chromium/ui/gfx/BUILD.gn
+++ b/chromium/ui/gfx/BUILD.gn
@@ -555,7 +555,7 @@ source_set("memory_buffer_sources") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_linux) {
+  if (is_linux && !use_qt) {
     sources += [
       "linux/client_native_pixmap_dmabuf.cc",
       "linux/client_native_pixmap_dmabuf.h",
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index c289de7ae19..53a153cbe33 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -304,11 +304,32 @@ component("gl") {
     deps += [ ":gl_jni_headers" ]
   }
 
-  if (use_qt && (is_win || use_x11)) {
-    data_deps -= [
-      "//third_party/angle:libEGL",
-      "//third_party/angle:libGLESv2",
-    ]
+  if (use_qt) {
+    if (is_win || use_x11) {
+      data_deps -= [
+        "//third_party/angle:libEGL",
+        "//third_party/angle:libGLESv2",
+      ]
+    }
+    if (is_win) {
+      data_deps -= [
+        "//third_party/mesa:osmesa",
+      ]
+    }
+    if (is_linux || is_win) {
+      sources -= [
+        "gl_surface_egl.cc",
+        "gl_surface_egl.h",
+      ]
+    }
+    if (use_x11) {
+      sources -= [
+        "gl_surface_egl_x11.cc",
+        "gl_surface_egl_x11.h",
+        "gl_surface_glx.cc",
+        "gl_surface_glx.h",
+      ]
+    }
   }
 }
 
diff --git a/chromium/ui/gl/init/gl_factory_ozone.cc b/chromium/ui/gl/init/gl_factory_ozone.cc
index 8b35da419dd..4f0b30aaae0 100644
--- a/chromium/ui/gl/init/gl_factory_ozone.cc
+++ b/chromium/ui/gl/init/gl_factory_ozone.cc
@@ -30,6 +30,7 @@ bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
   return false;
 }
 
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -104,6 +105,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
 
   return nullptr;
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   if (HasGLOzone()) {
diff --git a/chromium/ui/gl/init/gl_factory_win.cc b/chromium/ui/gl/init/gl_factory_win.cc
index b9f442cd4e3..ac5130d4156 100644
--- a/chromium/ui/gl/init/gl_factory_win.cc
+++ b/chromium/ui/gl/init/gl_factory_win.cc
@@ -75,6 +75,7 @@ scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
   }
 }
 
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget window) {
   TRACE_EVENT0("gpu", "gl::init::CreateViewGLSurface");
   switch (GetGLImplementation()) {
@@ -135,6 +136,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
       return nullptr;
   }
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   GLImplementation implementation = GetGLImplementation();
diff --git a/chromium/ui/gl/init/gl_factory_x11.cc b/chromium/ui/gl/init/gl_factory_x11.cc
index b55fe76b197..23d6000ecf5 100644
--- a/chromium/ui/gl/init/gl_factory_x11.cc
+++ b/chromium/ui/gl/init/gl_factory_x11.cc
@@ -75,6 +75,7 @@ scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
   }
 }
 
+#ifndef TOOLKIT_QT
 scoped_refptr<GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget window) {
   TRACE_EVENT0("gpu", "gl::init::CreateViewGLSurface");
   switch (GetGLImplementation()) {
@@ -123,6 +124,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
       return nullptr;
   }
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   GLImplementation implementation = GetGLImplementation();
diff --git a/chromium/ui/gl/init/gl_initializer_ozone.cc b/chromium/ui/gl/init/gl_initializer_ozone.cc
index a42e220e2ba..7749343cf06 100644
--- a/chromium/ui/gl/init/gl_initializer_ozone.cc
+++ b/chromium/ui/gl/init/gl_initializer_ozone.cc
@@ -13,6 +13,7 @@
 namespace gl {
 namespace init {
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatform() {
   if (HasGLOzone())
     return GetGLOzone()->InitializeGLOneOffPlatform();
@@ -26,6 +27,7 @@ bool InitializeGLOneOffPlatform() {
   }
   return false;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
diff --git a/chromium/ui/gl/init/gl_initializer_win.cc b/chromium/ui/gl/init/gl_initializer_win.cc
index 80e7abbeccd..73ad94c3780 100644
--- a/chromium/ui/gl/init/gl_initializer_win.cc
+++ b/chromium/ui/gl/init/gl_initializer_win.cc
@@ -224,6 +224,7 @@ bool InitializeStaticWGLInternal() {
 
 }  // namespace
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatform() {
   VSyncProviderWin::InitializeOneOff();
 
@@ -250,6 +251,7 @@ bool InitializeGLOneOffPlatform() {
   }
   return true;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
diff --git a/chromium/ui/gl/init/gl_initializer_x11.cc b/chromium/ui/gl/init/gl_initializer_x11.cc
index 2392e65d612..9ad8ee64b9e 100644
--- a/chromium/ui/gl/init/gl_initializer_x11.cc
+++ b/chromium/ui/gl/init/gl_initializer_x11.cc
@@ -142,6 +142,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
 
 }  // namespace
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatform() {
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
@@ -174,6 +175,7 @@ bool InitializeGLOneOffPlatform() {
       return true;
   }
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu