From ddd065ed26206d7ded61a4e5a35abb0cd6dbd9bc Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@posteo.de>
Date: Fri, 5 Mar 2021 17:42:48 +0000
Subject: [PATCH] Bug 1696319 - Stick to GDK_IS_X11_DISPLAY for now, r=stransky

In D106726 this was changed to `GDK_IS_WAYLAND_DISPLAY` as a drive-by
cleanup, in order to eventually support compiling FF without X11 support.
Turns out that was misguided as it breaks compatability with
setups that have GTK compiled without Wayland support.

Stick to `GDK_IS_X11_DISPLAY` until we have a better solution.

Differential Revision: https://phabricator.services.mozilla.com/D107345
---
 widget/GfxInfoX11.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
index 4704ccf3e757..ac8838282a88 100644
--- a/widget/GfxInfoX11.cpp
+++ b/widget/GfxInfoX11.cpp
@@ -463,7 +463,7 @@ void GfxInfo::GetData() {
   mAdapterDescription.Assign(glRenderer);
 #ifdef MOZ_WAYLAND
   mIsWayland = gdk_display_get_default() &&
-               GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default());
+               !GDK_IS_X11_DISPLAY(gdk_display_get_default());
   if (mIsWayland) {
     mIsWaylandDRM = GetDMABufDevice()->IsDMABufVAAPIEnabled() ||
                     GetDMABufDevice()->IsDMABufWebGLEnabled() ||