| Index: LayoutTests/css3/flexbox/multiline-align-content-horizontal-column.html
|
| diff --git a/LayoutTests/css3/flexbox/multiline-align-content-horizontal-column.html b/LayoutTests/css3/flexbox/multiline-align-content-horizontal-column.html
|
| index 06393efe9e903f91121a1b5039a7313e7756da62..1d1d9257765cbf0c37507d8d536b09bf4b3bc2bb 100644
|
| --- a/LayoutTests/css3/flexbox/multiline-align-content-horizontal-column.html
|
| +++ b/LayoutTests/css3/flexbox/multiline-align-content-horizontal-column.html
|
| @@ -3,7 +3,7 @@
|
| <style>
|
| .flexbox {
|
| position: relative;
|
| - display: -webkit-flex;
|
| + display: flex;
|
| background-color: grey;
|
| width: 600px;
|
| height: 20px;
|
| @@ -24,34 +24,34 @@
|
| -webkit-writing-mode: horizontal-bt;
|
| }
|
| .column {
|
| - -webkit-flex-flow: column;
|
| + flex-flow: column;
|
| }
|
| .column-reverse {
|
| - -webkit-flex-flow: column-reverse;
|
| + flex-flow: column-reverse;
|
| }
|
| .wrap {
|
| - -webkit-flex-wrap: wrap;
|
| + flex-wrap: wrap;
|
| }
|
| .wrap-reverse {
|
| - -webkit-flex-wrap: wrap-reverse;
|
| + flex-wrap: wrap-reverse;
|
| }
|
| .align-content-flex-start {
|
| - -webkit-align-content: flex-start;
|
| + align-content: flex-start;
|
| }
|
| .align-content-flex-end {
|
| - -webkit-align-content: flex-end;
|
| + align-content: flex-end;
|
| }
|
| .align-content-center {
|
| - -webkit-align-content: center;
|
| + align-content: center;
|
| }
|
| .align-content-space-between {
|
| - -webkit-align-content: space-between;
|
| + align-content: space-between;
|
| }
|
| .align-content-space-around {
|
| - -webkit-align-content: space-around;
|
| + align-content: space-around;
|
| }
|
| .align-content-stretch {
|
| - -webkit-align-content: stretch;
|
| + align-content: stretch;
|
| }
|
| .flexbox > :nth-child(1) {
|
| background-color: blue;
|
| @@ -236,7 +236,7 @@ function mainAxisDirection(writingMode, flexDirection)
|
| function addChild(flexbox, preferredSize, alignContent, expected_x_offset)
|
| {
|
| var child = document.createElement('div');
|
| - child.setAttribute('style', '-webkit-flex: 1 ' + preferredSize + 'px;'
|
| + child.setAttribute('style', 'flex: 1 ' + preferredSize + 'px;'
|
| + 'min-width: 100px');
|
|
|
| child.setAttribute("data-expected-width", alignContent == "stretch" ? "300" : "100");
|
|
|