Auto merge of #14978 - shinglyu:inline-flex, r=notriddle

Implemented display: inline-flex

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

---
<!-- 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] These changes fix #14685 (github issue number if applicable).

<!-- Either: -->
- [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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14978)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-22 19:57:49 -08:00 committed by GitHub
commit c75946c3ed
9 changed files with 28 additions and 26 deletions

View file

@ -1,5 +0,0 @@
[display_inline-flex_exist.htm]
type: testharness
[CSS Flexible Box Test: display_inline-flex]
expected: FAIL

View file

@ -1,5 +0,0 @@
[flexbox_computedstyle_display-inline.htm]
type: testharness
[flexbox | computed style | display: inline-flex]
expected: FAIL

View file

@ -1,3 +0,0 @@
[flexbox_inline.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[ttwf-reftest-flex-inline.htm]
type: reftest
expected: FAIL