Add tests and small fixes for flexbox shorthands

components/style/properties/shorthand/position.mako.rs

@@ -4,49 +4,47 @@
 
 <%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">
     use properties::longhands::{flex_direction, flex_wrap};
 
     let mut direction = None;
     let mut wrap = None;
-    let mut any = false;
     loop {
         if direction.is_none() {
             if let Ok(value) = input.try(|input| flex_direction::parse(context, input)) {
                 direction = Some(value);
-                any = true;
                 continue
             }
         }
         if wrap.is_none() {
             if let Ok(value) = input.try(|input| flex_wrap::parse(context, input)) {
                 wrap = Some(value);
-                any = true;
                 continue
             }
         }
         break
     }
 
-    if any {
+    if direction.is_none() && wrap.is_none() {
+        return Err(())
+    }
     Ok(Longhands {
         flex_direction: direction,
         flex_wrap: wrap,
     })
-    } else {
-        Err(())
-    }
 </%helpers:shorthand>
 
+// https://drafts.csswg.org/css-flexbox/#flex-property
 <%helpers:shorthand name="flex" sub_properties="flex-grow flex-shrink flex-basis"
                                 experimental="True">
     use app_units::Au;
     use values::specified::{Number, Length, LengthOrPercentageOrAutoOrContent};
 
     pub fn parse_flexibility(input: &mut Parser)
-                             -> Result<(Option<Number>, Option<Number>),()> {
+                             -> Result<(Number, Option<Number>),()> {
-        let grow = Some(try!(Number::parse_non_negative(input)));
+        let grow = try!(Number::parse_non_negative(input));
         let shrink = input.try(Number::parse_non_negative).ok();
         Ok((grow, shrink))
     }
@@ -54,7 +52,6 @@
     let mut grow = None;
     let mut shrink = None;
     let mut basis = None;
-    let mut any = false;
 
     if input.try(|input| input.expect_ident_matching("none")).is_ok() {
         return Ok(Longhands {
@@ -66,40 +63,26 @@
     loop {
         if grow.is_none() {
             if let Ok((flex_grow, flex_shrink)) = input.try(parse_flexibility) {
-                grow = flex_grow;
+                grow = Some(flex_grow);
                 shrink = flex_shrink;
-                any = true;
                 continue
             }
         }
         if basis.is_none() {
             if let Ok(value) = input.try(LengthOrPercentageOrAutoOrContent::parse) {
                 basis = Some(value);
-                any = true;
                 continue
             }
         }
         break
     }
-    if any {
+
-        if grow == None {
+    if grow.is_none() && basis.is_none() {
-            grow = Some(Number(1.0));
+        return Err(())
-        }
-        if shrink == None && basis == None {
-            basis = Some(LengthOrPercentageOrAutoOrContent::Length(Length::Absolute(Au(0))));
-        }
-        if shrink == None {
-            shrink = Some(Number(1.0));
-        }
-        if basis == None {
-            basis = Some(LengthOrPercentageOrAutoOrContent::Auto);
     }
     Ok(Longhands {
-            flex_grow: grow,
+        flex_grow: grow.or(Some(Number(1.0))),
-            flex_shrink: shrink,
+        flex_shrink: shrink.or(Some(Number(1.0))),
-            flex_basis: basis,
+        flex_basis: basis.or(Some(LengthOrPercentageOrAutoOrContent::Length(Length::Absolute(Au(0)))))
     })
-    } else {
-        Err(())
-    }
 </%helpers:shorthand>

tests/wpt/metadata-css/css-flexbox-1_dev/html/css-flexbox-column-reverse.htm.ini

@@ -0,0 +1,3 @@
+[css-flexbox-column-reverse.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-nowrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-nowrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column nowrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-reverse-nowrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-nowrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column-reverse nowrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-reverse-wrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-wrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column-reverse wrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-reverse.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column-reverse]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-wrap-reverse.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap-reverse.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column wrap-reverse]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column-wrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column wrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-column.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-column.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: column]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-reverse-nowrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-nowrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row-reverse nowrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row-reverse wrap-reverse]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-reverse-wrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row-reverse wrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-reverse.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row-reverse]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-wrap-reverse.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap-reverse.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row wrap-reverse]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-row-wrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: row wrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-flow-wrap.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-flow-wrap.htm]
-  type: testharness
-  [flexbox | computed style | flex-flow: wrap]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-shorthand-auto.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-auto.htm]
-  type: testharness
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-shorthand-none.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-none.htm]
-  type: testharness
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-shorthand-number.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-number.htm]
-  type: testharness
-  [flexbox | computed style | flex: number]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_flex-shorthand.htm.ini

@@ -1,5 +0,0 @@
-[flexbox_computedstyle_flex-shorthand.htm]
-  type: testharness
-  [flexbox | computed style | flex: invalid]
-    expected: FAIL
-

tests/wpt/metadata-css/css-flexbox-1_dev/html/percentage-heights-000.htm.ini

@@ -9,9 +9,6 @@
   [.flexbox 3]
     expected: FAIL
 
-  [.flexbox 4]
-    expected: FAIL
-
   [.flexbox 5]
     expected: FAIL