[mutter/wip/carlosg/xwayland-startup-side-channel: 1/3] backends: Drop autostart-xwayland experimental setting

[Carlos Garnacho <carlosg src gnome org>]

commit 2dca548685c49a0b75099a218e3590f9e2bff480
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Nov 16 15:19:42 2019 +0100

    backends: Drop autostart-xwayland experimental setting
    
    And make it happen by default. It is what we eventually want, and seems a
    better approach overall than refactoring Xwayland startup code so we may
    reach the MetaDisplay in order to emit ::init-xserver while it is still
    being constructed. Doing so on demand will guarantee the MetaDisplay is
    already set up.

 src/backends/meta-settings-private.h | 1 -
 src/backends/meta-settings.c         | 2 --
 src/core/main.c                      | 9 +--------
 3 files changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/src/backends/meta-settings-private.h b/src/backends/meta-settings-private.h
index 7d610d5b4..fe55b94f8 100644
--- a/src/backends/meta-settings-private.h
+++ b/src/backends/meta-settings-private.h
@@ -34,7 +34,6 @@ typedef enum _MetaExperimentalFeature
   META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER = (1 << 0),
   META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS  = (1 << 1),
   META_EXPERIMENTAL_FEATURE_RT_SCHEDULER = (1 << 2),
-  META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND  = (1 << 3),
 } MetaExperimentalFeature;
 
 #define META_TYPE_SETTINGS (meta_settings_get_type ())
diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
index 66f826f51..e48a47933 100644
--- a/src/backends/meta-settings.c
+++ b/src/backends/meta-settings.c
@@ -266,8 +266,6 @@ experimental_features_handler (GVariant *features_variant,
         features |= META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS;
       else if (g_str_equal (feature, "rt-scheduler"))
         features |= META_EXPERIMENTAL_FEATURE_RT_SCHEDULER;
-      else if (g_str_equal (feature, "autostart-xwayland"))
-        features |= META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND;
       else
         g_info ("Unknown experimental feature '%s'\n", feature);
     }
diff --git a/src/core/main.c b/src/core/main.c
index 16aa8736a..346632b16 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -731,20 +731,13 @@ meta_get_x11_display_policy (void)
 {
   MetaBackend *backend = meta_get_backend ();
 
-  if (META_IS_BACKEND_X11_CM (backend))
-    return META_DISPLAY_POLICY_MANDATORY;
-
 #ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor ())
     {
-      MetaSettings *settings = meta_backend_get_settings (backend);
-
       if (opt_no_x11)
         return META_DISPLAY_POLICY_DISABLED;
 
-      if (meta_settings_is_experimental_feature_enabled (settings,
-                                                         META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND))
-        return META_DISPLAY_POLICY_ON_DEMAND;
+      return META_DISPLAY_POLICY_ON_DEMAND;
     }
 #endif