Auto merge of #11948 - stshine:flex-shorthand-properties, r=emilio

Support 'flex' and 'flex-flow' shorthand properties

<!-- Please describe your changes on the following line: -->

Support the `flex` and `flex-flow` shorthand properties in
servo. Currently they are marked as experimental, so they are added to
`__dir__.ini`.
Thanks SimonSapin and jdm for help :)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11948)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-05 20:08:07 -07:00 committed by GitHub
commit 0d76cf8e5c
24 changed files with 96 additions and 93 deletions

View file

@ -1,4 +1,5 @@
prefs: ["layout.flex.enabled:true",
"layout.flex-flow.enabled:true",
"layout.flex-direction.enabled:true",
"layout.flex-wrap.enabled:true",
"layout.flex-grow.enabled:true",

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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