From 77f47eea34f7cc3cd049220008a92fc0a3e214c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 22 Jul 2018 16:10:23 +0200
Subject: [PATCH] style: Hide display: -moz-box|-moz-inline-box from content on
 Nightly and early beta.

Bug: 1477553
Differential Revision: https://phabricator.services.mozilla.com/D2288
---
 components/style/values/specified/box.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 632c8f9c9d4..cec7c8ccc33 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -30,6 +30,17 @@ fn moz_display_values_enabled(context: &ParserContext) -> bool {
     }
 }
 
+#[cfg(feature = "gecko")]
+fn moz_box_display_values_enabled(context: &ParserContext) -> bool {
+    use gecko_bindings::structs;
+    use stylesheets::Origin;
+    context.stylesheet_origin == Origin::UserAgent ||
+    context.chrome_rules_enabled() ||
+    unsafe {
+        structs::StaticPrefs_sVarCache_layout_css_xul_box_display_values_content_enabled
+    }
+}
+
 #[allow(missing_docs)]
 #[derive(Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq,
          SpecifiedValueInfo, ToComputedValue, ToCss)]
@@ -80,8 +91,10 @@ pub enum Display {
     #[cfg(feature = "gecko")]
     WebkitInlineBox,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "moz_box_display_values_enabled")]
     MozBox,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "moz_box_display_values_enabled")]
     MozInlineBox,
     #[cfg(feature = "gecko")]
     #[parse(condition = "moz_display_values_enabled")]