Disable X11 backend when compiling for Wayland

The following explicit call to XOpenDisplay:

  self->display = XOpenDisplay(DisplayString(display));

prevents us from linking without X11 library, so let's define
DISALBE_X11_BACKEND when "use_wayland_backend" is in use and
disable the X11 backend entirely.

resolved conflicts on shell/platform/linux/fl_view.cc
again removed shell/platform/linux/fl_renderer_x11.cc shell/platform/linux/fl_renderer_x11.h

Signed-off-by: Damian Wrobel <[email protected]>

Author: dwrobel

shell/platform/linux/BUILD.gn

@@ -126,6 +126,12 @@ source_set("flutter_linux_sources") {
     "FLUTTER_ENGINE_NO_PROTOTYPES",
   ]
 
+  if (use_wayland_backend) {
+    defines += [
+      "DISALBE_X11_BACKEND",
+    ]
+  }
+
   deps = [
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",

shell/platform/linux/fl_view.cc

@@ -6,6 +6,10 @@
 
 #include "flutter/shell/platform/linux/fl_view_private.h"
 
+#include <gdk/gdkwayland.h>
+#if defined(GDK_WINDOWING_X11) && !defined(DISALBE_X11_BACKEND)
+#include <gdk/gdkx.h>
+#endif
 #include <cstring>
 
 #include "flutter/shell/platform/linux/fl_accessibility_plugin.h"
@@ -154,9 +158,18 @@ static void fl_view_plugin_registry_iface_init(
   iface->get_registrar_for_plugin = fl_view_get_registrar_for_plugin;
 }
 
+<<<<<<< HEAD
 static gboolean event_box_button_release_event(GtkWidget* widget,
                                                GdkEventButton* event,
                                                FlView* view);
+=======
+static FlRenderer* fl_view_get_renderer_for_display(GdkDisplay* display) {
+#if defined(GDK_WINDOWING_X11) && !defined(DISALBE_X11_BACKEND)
+  if (GDK_IS_X11_DISPLAY(display)) {
+    return FL_RENDERER(fl_renderer_x11_new());
+  }
+#endif
+>>>>>>> b456129a1... Disable X11 backend when compiling for Wayland
 
 static gboolean event_box_button_press_event(GtkWidget* widget,
                                              GdkEventButton* event,