--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -7099,32 +7099,20 @@ nsWindow::GetCSDSupportLevel() {
 int32_t
 nsWindow::RoundsWidgetCoordinatesTo()
 {
     return GdkScaleFactor();
 }
 
 void nsWindow::GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData)
 {
-#ifdef MOZ_X11
-#ifdef MOZ_WAYLAND
-  if (!mIsX11Display) {
-    *aInitData = mozilla::widget::GtkCompositorWidgetInitData(
-                                  (uintptr_t)nullptr,
-                                  nsCString(nullptr),
-                                  GetClientSize());
-  } else
-#endif
-  {
-    *aInitData = mozilla::widget::GtkCompositorWidgetInitData(
-                                  mXWindow,
-                                  nsCString(XDisplayString(mXDisplay)),
-                                  GetClientSize());
-  }
-#endif
+  *aInitData = mozilla::widget::GtkCompositorWidgetInitData(
+                                (mXWindow != X11None) ? mXWindow : (uintptr_t)nullptr,
+                                mXDisplay ? nsCString(XDisplayString(mXDisplay)) : nsCString(),
+                                GetClientSize());
 }
 
 bool
 nsWindow::IsComposited() const
 {
   if (!mGdkWindow) {
     NS_WARNING("nsWindow::HasARGBVisual called before realization!");
     return false;