Auto merge of #14111 - servo:pcwalton-turn-flexbox-on, r=emilio,jdm

style: Turn the CSS flexible box model on by default.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14111)
<!-- Reviewable:end -->

18 files changed, 6 insertions, 62 deletions

diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
index fb843144c36..8b145c5ee77 100644
--- a/components/style/properties/longhand/box.mako.rs
+++ b/components/style/properties/longhand/box.mako.rs
@@ -23,7 +23,6 @@
         """.split()
         if product == "gecko":
             values += "-moz-box -moz-inline-box".split()
-        experimental_values = set("flex".split())
     %>
     pub use self::computed_value::T as SpecifiedValue;
     use values::computed::ComputedValueAsSpecified;
@@ -61,12 +60,6 @@
         match_ignore_ascii_case! { try!(input.expect_ident()),
             % for value in values:
                 "${value}" => {
-                    % if value in experimental_values and product == "servo":
-                        if !::util::prefs::PREFS.get("layout.${value}.enabled")
-                            .as_boolean().unwrap_or(false) {
-                            return Err(())
-                        }
-                    % endif
                     Ok(computed_value::T::${to_rust_ident(value)})
                 },
             % endfor
diff --git a/components/style/properties/longhand/position.mako.rs b/components/style/properties/longhand/position.mako.rs
index a3166ea8238..ab1ae61b435 100644
--- a/components/style/properties/longhand/position.mako.rs
+++ b/components/style/properties/longhand/position.mako.rs
@@ -66,15 +66,14 @@
 
 // Flex container properties
 ${helpers.single_keyword("flex-direction", "row row-reverse column column-reverse",
-                         experimental=True, animatable=False)}
+                         animatable=False)}
 
 ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse",
-                         experimental=True, animatable=False)}
+                         animatable=False)}
 
 // FIXME(stshine): The type of 'justify-content' and 'align-content' is uint16_t in gecko
 // FIXME(stshine): Its higher bytes are used to store fallback value. Disable them in geckolib for now
 ${helpers.single_keyword("justify-content", "flex-start flex-end center space-between space-around",
-                         experimental=True,
                          gecko_constant_prefix="NS_STYLE_JUSTIFY",
                          products="servo",
                          animatable=False)}
@@ -82,14 +81,12 @@ ${helpers.single_keyword("justify-content", "flex-start flex-end center space-be
 // FIXME(heycam): Disable align-items in geckolib since we don't support the Gecko initial value
 // 'normal' yet.
 ${helpers.single_keyword("align-items", "stretch flex-start flex-end center baseline",
-                         experimental=True,
                          need_clone=True,
                          gecko_constant_prefix="NS_STYLE_ALIGN",
                          animatable=False,
                          products="servo")}
 
 ${helpers.single_keyword("align-content", "stretch flex-start flex-end center space-between space-around",
-                         experimental=True,
                          gecko_constant_prefix="NS_STYLE_ALIGN",
                          products="servo",
                          animatable=False)}
@@ -97,14 +94,13 @@ ${helpers.single_keyword("align-content", "stretch flex-start flex-end center sp
 // Flex item properties
 ${helpers.predefined_type("flex-grow", "Number",
                           "0.0", "parse_non_negative",
-                          experimental=True, animatable=True)}
+                          animatable=True)}
 
 ${helpers.predefined_type("flex-shrink", "Number",
                           "1.0", "parse_non_negative",
-                          experimental=True, animatable=True)}
+                          animatable=True)}
 
 ${helpers.single_keyword("align-self", "auto stretch flex-start flex-end center baseline",
-                         experimental=True,
                          need_clone=True,
                          gecko_constant_prefix="NS_STYLE_ALIGN",
                          animatable=False)}
diff --git a/components/style/properties/shorthand/position.mako.rs b/components/style/properties/shorthand/position.mako.rs
index 5064c375215..7eeebd9c1ab 100644
--- a/components/style/properties/shorthand/position.mako.rs
+++ b/components/style/properties/shorthand/position.mako.rs
@@ -5,8 +5,7 @@
 <%namespace name="helpers" file="/helpers.mako.rs" />
 
 // https://drafts.csswg.org/css-flexbox/#flex-flow-property
-<%helpers:shorthand name="flex-flow" sub_properties="flex-direction flex-wrap"
-                                     experimental="True">
+<%helpers:shorthand name="flex-flow" sub_properties="flex-direction flex-wrap">
     use properties::longhands::{flex_direction, flex_wrap};
 
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
@@ -56,8 +55,7 @@
 </%helpers:shorthand>
 
 // https://drafts.csswg.org/css-flexbox/#flex-property
-<%helpers:shorthand name="flex" sub_properties="flex-grow flex-shrink flex-basis"
-                                experimental="True">
+<%helpers:shorthand name="flex" sub_properties="flex-grow flex-shrink flex-basis">
     use app_units::Au;
     use values::specified::{Number, Length, LengthOrPercentageOrAutoOrContent};
 
diff --git a/resources/package-prefs.json b/resources/package-prefs.json
index d77d13f4b0c..7f0cda53b13 100644
--- a/resources/package-prefs.json
+++ b/resources/package-prefs.json
@@ -49,8 +49,6 @@
   "layout.column-gap.enabled": false,
   "layout.column-width.enabled": false,
   "layout.columns.enabled": false,
-  "layout.flex-direction.enabled": false,
-  "layout.flex.enabled": false,
   "layout.text-orientation.enabled": false,
   "layout.viewport.enabled": false,
   "layout.writing-mode.enabled": false,
diff --git a/resources/prefs.json b/resources/prefs.json
index c8fe13590e5..0b542acabfc 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -50,8 +50,6 @@
   "layout.column-gap.enabled": false,
   "layout.column-width.enabled": false,
   "layout.columns.enabled": false,
-  "layout.flex-direction.enabled": false,
-  "layout.flex.enabled": false,
   "layout.text-orientation.enabled": false,
   "layout.viewport.enabled": false,
   "layout.writing-mode.enabled": false,
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-order.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-order.htm.ini
deleted file mode 100644
index a9689d9d607..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-order.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flex-order.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-baseline-horiz-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-baseline-horiz-004.htm.ini
deleted file mode 100644
index 86855e1d300..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-baseline-horiz-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-self-baseline-horiz-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-horiz-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-horiz-005.htm.ini
deleted file mode 100644
index 852c25e5146..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-align-self-horiz-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-self-horiz-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-003.htm.ini
deleted file mode 100644
index 8466e0c20a3..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-overflow-horiz-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-004.htm.ini
deleted file mode 100644
index 65b75830feb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-overflow-horiz-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-005.htm.ini
deleted file mode 100644
index 57bca16a45c..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-overflow-horiz-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-overflow-horiz-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001a.htm.ini
deleted file mode 100644
index 212779ad895..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001a.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-root-node-001a.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001b.htm.ini
deleted file mode 100644
index ff8dd0be09b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-root-node-001b.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-root-node-001b.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-002.htm.ini
deleted file mode 100644
index 5d49fbbd99d..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-whitespace-handling-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-001.htm.ini
deleted file mode 100644
index 195d8daf140..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-001.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-with-pseudo-elements-001.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-002.htm.ini
deleted file mode 100644
index 5e2885b05b6..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-with-pseudo-elements-002.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm.ini
deleted file mode 100644
index c55e038cd46..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-with-pseudo-elements-003.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-with-pseudo-elements-003.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_absolute-atomic.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_absolute-atomic.htm.ini
deleted file mode 100644
index 36406b0ddfb..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_absolute-atomic.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_absolute-atomic.htm]
-  type: reftest
-  expected: FAIL