| Index: LayoutTests/css3/flexbox/line-wrapping.html
|
| diff --git a/LayoutTests/css3/flexbox/line-wrapping.html b/LayoutTests/css3/flexbox/line-wrapping.html
|
| index 0a5bd6e3102b165cadb2bc2755748df2e1032215..a06541c597132b39d8e7b7d94148ac966ce63dcf 100644
|
| --- a/LayoutTests/css3/flexbox/line-wrapping.html
|
| +++ b/LayoutTests/css3/flexbox/line-wrapping.html
|
| @@ -8,10 +8,10 @@ body {
|
| border: 1px solid;
|
| }
|
| .column {
|
| - -webkit-flex-flow: column;
|
| + flex-flow: column;
|
| }
|
| .flexbox {
|
| - display: -webkit-flex;
|
| + display: flex;
|
| background-color: gray;
|
| position: relative;
|
| }
|
| @@ -42,17 +42,17 @@ body {
|
| }
|
|
|
| .horizontal-tb.row > div {
|
| - -webkit-flex: 1;
|
| + flex: 1;
|
| }
|
| .vertical-lr.row > div, .vertical-rl.row > div {
|
| - -webkit-flex: 1;
|
| + flex: 1;
|
| }
|
|
|
| .horizontal-tb.column > div {
|
| - -webkit-flex: 1 auto;
|
| + flex: 1 auto;
|
| }
|
| .vertical-lr.column > div, .vertical-rl.column > div {
|
| - -webkit-flex: 1 auto;
|
| + flex: 1 auto;
|
| }
|
|
|
| .horizontal-tb.fixed {
|
| @@ -115,7 +115,7 @@ body {
|
| <div data-expected-width=100 data-expected-height=100>
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=0></div>
|
| </div>
|
| - <div data-expected-width=100 data-expected-height=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-width=100 data-expected-height=40 style="align-self: flex-start;">
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=100></div>
|
| </div>
|
| </div>
|
| @@ -124,7 +124,7 @@ body {
|
| <div data-expected-width=200 data-expected-height=50>
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=0></div>
|
| </div>
|
| - <div data-expected-width=200 data-expected-height=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-width=200 data-expected-height=50 style="align-self: flex-start;">
|
| <div data-offset-y=50></div><div data-offset-y=50></div><div data-offset-y=50></div><div data-offset-y=50></div><div data-offset-y=50></div><div data-offset-y=70 data-offset-x=0></div>
|
| </div>
|
| </div>
|
| @@ -133,7 +133,7 @@ body {
|
| <div data-expected-width=200 data-expected-height=50>
|
| <div data-offset-y=0></div><div data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-width=80 data-expected-height=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-width=80 data-expected-height=50 style="align-self: flex-start;">
|
| <div data-offset-y=50></div><div data-offset-y=50></div>
|
| </div>
|
| </div>
|
| @@ -142,7 +142,7 @@ body {
|
| <div data-expected-width=250 data-expected-height=100>
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=0></div>
|
| </div>
|
| - <div data-expected-width=250 data-expected-height=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-width=250 data-expected-height=40 style="align-self: flex-start;">
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=250></div>
|
| </div>
|
| </div>
|
| @@ -151,7 +151,7 @@ body {
|
| <div data-expected-width=500 data-expected-height=40>
|
| <div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=0></div><div data-offset-y=20 data-offset-x=0></div>
|
| </div>
|
| - <div data-expected-width=500 data-expected-height=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-width=500 data-expected-height=40 style="align-self: flex-start;">
|
| <div data-offset-y=40></div><div data-offset-y=40></div><div data-offset-y=40></div><div data-offset-y=40></div><div data-offset-y=40></div><div data-offset-y=60 data-offset-x=0></div>
|
| </div>
|
| </div>
|
| @@ -162,7 +162,7 @@ body {
|
| <div data-expected-height data-expected-width=100>
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=100 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=100 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=100></div>
|
| </div>
|
| </div>
|
| @@ -171,7 +171,7 @@ body {
|
| <div data-expected-height=200 data-expected-width=50>
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=200 data-expected-width=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=200 data-expected-width=50 style="align-self: flex-start;">
|
| <div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=74 data-offset-y=0></div>
|
| </div>
|
| </div>
|
| @@ -180,7 +180,7 @@ body {
|
| <div data-expected-height=200 data-expected-width=50>
|
| <div data-offset-x=4></div><div data-offset-x=4></div>
|
| </div>
|
| - <div data-expected-height=80 data-expected-width=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=80 data-expected-width=50 style="align-self: flex-start;">
|
| <div data-offset-x=54></div><div data-offset-x=54></div>
|
| </div>
|
| </div>
|
| @@ -189,7 +189,7 @@ body {
|
| <div data-expected-height=250 data-expected-width=100>
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=250 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=250 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=250></div>
|
| </div>
|
| </div>
|
| @@ -198,7 +198,7 @@ body {
|
| <div data-expected-height=500 data-expected-width=40>
|
| <div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=500 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=500 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=64 data-offset-y=0></div>
|
| </div>
|
| </div>
|
| @@ -208,7 +208,7 @@ body {
|
| <div data-expected-height=100 data-expected-width=100>
|
| <div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=60 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=100 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=100 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=60 data-offset-y=100></div>
|
| </div>
|
| </div>
|
| @@ -217,7 +217,7 @@ body {
|
| <div data-expected-height=200 data-expected-width=50>
|
| <div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=60 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=200 data-expected-width=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=200 data-expected-width=50 style="align-self: flex-start;">
|
| <div data-offset-x=30></div><div data-offset-x=30></div><div data-offset-x=30></div><div data-offset-x=30></div><div data-offset-x=30></div><div data-offset-x=10 data-offset-y=0></div>
|
| </div>
|
| </div>
|
| @@ -226,7 +226,7 @@ body {
|
| <div data-expected-height=200 data-expected-width=50>
|
| <div data-offset-x=80></div><div data-offset-x=80></div>
|
| </div>
|
| - <div data-expected-height=80 data-expected-width=50 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=80 data-expected-width=50 style="align-self: flex-start;">
|
| <div data-offset-x=30></div><div data-offset-x=30></div>
|
| </div>
|
| </div>
|
| @@ -235,7 +235,7 @@ body {
|
| <div data-expected-height=250 data-expected-width=100>
|
| <div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=60 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=250 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=250 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=80></div><div data-offset-x=80></div><div data-offset-x=60 data-offset-y=250></div>
|
| </div>
|
| </div>
|
| @@ -244,7 +244,7 @@ body {
|
| <div data-expected-height=500 data-expected-width=40>
|
| <div data-offset-x=60></div><div data-offset-x=60></div><div data-offset-x=60></div><div data-offset-x=60></div><div data-offset-x=60></div><div data-offset-x=40 data-offset-y=0></div>
|
| </div>
|
| - <div data-expected-height=500 data-expected-width=40 style="-webkit-align-self: flex-start;">
|
| + <div data-expected-height=500 data-expected-width=40 style="align-self: flex-start;">
|
| <div data-offset-x=20></div><div data-offset-x=20></div><div data-offset-x=20></div><div data-offset-x=20></div><div data-offset-x=20></div><div data-offset-x=0 data-offset-y=0></div>
|
| </div>
|
| </div>
|
|
|