Remove dependency on libgbm

We don't currently use it so avoid adding it as a dependency

Change-Id: Id363ddfc4d6d95af8325dc73fb7e240a8d80c95e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

7 files changed, 11 insertions, 8 deletions

diff --git a/chromium/ui/gfx/linux/BUILD.gn b/chromium/ui/gfx/linux/BUILD.gn
index 3d02d93c375..82baa384fe7 100644
--- a/chromium/ui/gfx/linux/BUILD.gn
+++ b/chromium/ui/gfx/linux/BUILD.gn
@@ -46,7 +46,7 @@ source_set("gbm") {
   ]
 }
 
-if (use_x11 || ozone_platform_x11) {
+if ((use_x11 || ozone_platform_x11) && !use_qt) {
   component("gpu_memory_buffer_support_x11") {
     sources = [
       "gpu_memory_buffer_support_x11.cc",
diff --git a/chromium/ui/gl/gl_utils.cc b/chromium/ui/gl/gl_utils.cc
index d404739aeaf..9667a44be8f 100644
--- a/chromium/ui/gl/gl_utils.cc
+++ b/chromium/ui/gl/gl_utils.cc
@@ -153,7 +153,7 @@ bool ShouldForceDirectCompositionRootSurfaceFullDamage() {
 }
 #endif  // OS_WIN
 
-#if defined(USE_X11) || defined(USE_OZONE_PLATFORM_X11)
+#if (defined(USE_X11) || defined(USE_OZONE_PLATFORM_X11)) && !defined(TOOLKIT_QT)
 void CollectX11GpuExtraInfo(bool enable_native_gpu_memory_buffers,
                             gfx::GpuExtraInfo& info) {
   // TODO(https://crbug.com/1031269): Enable by default.
diff --git a/chromium/ui/gl/gl_utils.h b/chromium/ui/gl/gl_utils.h
index 0ac70a4a19c..96883ac6713 100644
--- a/chromium/ui/gl/gl_utils.h
+++ b/chromium/ui/gl/gl_utils.h
@@ -59,7 +59,7 @@ GL_EXPORT unsigned int DirectCompositionRootSurfaceBufferCount();
 GL_EXPORT bool ShouldForceDirectCompositionRootSurfaceFullDamage();
 #endif
 
-#if defined(USE_X11) || defined(USE_OZONE_PLATFORM_X11)
+#if (defined(USE_X11) || defined(USE_OZONE_PLATFORM_X11)) && !defined(TOOLKIT_QT)
 // Collects the GPU extra info on X11 platforms.
 // |enable_native_gpu_memory_buffers| should be taken from GpuPreferences.
 // TODO(crbug/1096425) remove this once Ozone is default on Linux.
diff --git a/chromium/ui/ozone/BUILD.gn b/chromium/ui/ozone/BUILD.gn
index 2f35acc80a1..8e3445e6cb0 100644
--- a/chromium/ui/ozone/BUILD.gn
+++ b/chromium/ui/ozone/BUILD.gn
@@ -23,8 +23,8 @@ ozone_platform_deps = ozone_external_platform_deps
 ozone_platform_test_deps = ozone_external_platform_test_deps
 
 # Extra dependencies to pull into ui_test_support for built platforms.
-ozone_platform_ui_test_support_deps =
-    ozone_external_platform_ui_test_support_deps
+ozone_platform_ui_test_support_deps = []
+#    ozone_external_platform_ui_test_support_deps
 
 if (ozone_platform_windows) {
   ozone_platforms += [ "windows" ]
diff --git a/chromium/ui/ozone/platform/x11/BUILD.gn b/chromium/ui/ozone/platform/x11/BUILD.gn
index 4b2643f4a73..571cd150890 100644
--- a/chromium/ui/ozone/platform/x11/BUILD.gn
+++ b/chromium/ui/ozone/platform/x11/BUILD.gn
@@ -66,8 +66,8 @@ source_set("x11") {
     "//ui/events/x",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/gfx/linux:gbm",
-    "//ui/gfx/linux:gpu_memory_buffer_support_x11",
+#    "//ui/gfx/linux:gbm",
+#    "//ui/gfx/linux:gpu_memory_buffer_support_x11",
     "//ui/gfx/x",
     "//ui/gl",
     "//ui/ozone:ozone_base",
diff --git a/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc b/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc
index fda67f30e2f..fcc643dbfec 100644
--- a/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc
+++ b/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc
@@ -256,6 +256,7 @@ class OzonePlatformX11 : public OzonePlatform,
 
   void InitializeGPU(const InitParams& params) override {
     InitializeCommon(params);
+#if !defined(TOOLKIT_QT)
     if (params.enable_native_gpu_memory_buffers) {
       base::ThreadPool::PostTask(
           FROM_HERE, base::BindOnce([]() {
@@ -263,6 +264,7 @@ class OzonePlatformX11 : public OzonePlatform,
             ui::GpuMemoryBufferSupportX11::GetInstance();
           }));
     }
+#endif
     // In single process mode either the UI thread will create an event source
     // or it's a test and an event source isn't desired.
     if (!params.single_process)
diff --git a/chromium/ui/ozone/platform/x11/x11_surface_factory.cc b/chromium/ui/ozone/platform/x11/x11_surface_factory.cc
index 4fd928c615f..da4b6ba1f41 100644
--- a/chromium/ui/ozone/platform/x11/x11_surface_factory.cc
+++ b/chromium/ui/ozone/platform/x11/x11_surface_factory.cc
@@ -149,6 +149,7 @@ scoped_refptr<gfx::NativePixmap> X11SurfaceFactory::CreateNativePixmap(
     gfx::BufferUsage usage,
     absl::optional<gfx::Size> framebuffer_size) {
   scoped_refptr<gfx::NativePixmapDmaBuf> pixmap;
+#if !defined(TOOLKIT_QT)
   auto buffer = ui::GpuMemoryBufferSupportX11::GetInstance()->CreateBuffer(
       format, size, usage);
   if (buffer) {
@@ -156,7 +157,7 @@ scoped_refptr<gfx::NativePixmap> X11SurfaceFactory::CreateNativePixmap(
     pixmap = base::MakeRefCounted<gfx::NativePixmapDmaBuf>(size, format,
                                                            std::move(handle));
   }
-
+#endif
   // CreateNativePixmap is non-blocking operation. Thus, it is safe to call it
   // and return the result with the provided callback.
   return pixmap;