Index: LayoutTests/css3/flexbox/flex-flow.html |
diff --git a/LayoutTests/css3/flexbox/flex-flow.html b/LayoutTests/css3/flexbox/flex-flow.html |
index f8ed62612919ac11c8ad75516d9eb8ded875a698..2076aaa094eb83901aefe66145de4f471eb71080 100644 |
--- a/LayoutTests/css3/flexbox/flex-flow.html |
+++ b/LayoutTests/css3/flexbox/flex-flow.html |
@@ -6,7 +6,7 @@ body { |
} |
.flexbox { |
width: 600px; |
- display: -webkit-flex; |
+ display: flex; |
background-color: grey; |
} |
.flexbox > div { |
@@ -36,15 +36,15 @@ body { |
} |
.row-reverse { |
- -webkit-flex-flow: row-reverse; |
+ flex-flow: row-reverse; |
} |
.column { |
- -webkit-flex-flow: column; |
+ flex-flow: column; |
} |
.column-reverse { |
- -webkit-flex-flow: column-reverse; |
+ flex-flow: column-reverse; |
} |
.flexbox > :nth-child(1) { |
@@ -66,86 +66,86 @@ body { |
<body onload="checkLayout('.flexbox')"> |
<div class="flexbox"> |
- <div data-expected-width="75" data-offset-x="0" style="-webkit-flex: 1 0 0; margin: 0 auto;"></div> |
- <div data-expected-width="350" data-offset-x="75" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="275"></div></div> |
- <div data-expected-width="75" data-offset-x="425" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-width="75" data-offset-x="0" style="flex: 1 0 0; margin: 0 auto;"></div> |
+ <div data-expected-width="350" data-offset-x="75" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="275"></div></div> |
+ <div data-expected-width="75" data-offset-x="425" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
<div class="flexbox rtl"> |
- <div data-expected-width="75" data-offset-x="525" style="-webkit-flex: 1 0 0; margin: 0 auto;"></div> |
- <div data-expected-width="350" data-offset-x="175" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="175"></div></div> |
- <div data-expected-width="75" data-offset-x="100" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-width="75" data-offset-x="525" style="flex: 1 0 0; margin: 0 auto;"></div> |
+ <div data-expected-width="350" data-offset-x="175" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="175"></div></div> |
+ <div data-expected-width="75" data-offset-x="100" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
<div class="flexbox row-reverse"> |
- <div data-expected-width="75" data-offset-x="525" style="-webkit-flex: 1 0 0; margin: 0 auto;"></div> |
- <div data-expected-width="350" data-offset-x="175" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="375"></div></div> |
- <div data-expected-width="75" data-offset-x="0" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-width="75" data-offset-x="525" style="flex: 1 0 0; margin: 0 auto;"></div> |
+ <div data-expected-width="350" data-offset-x="175" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="375"></div></div> |
+ <div data-expected-width="75" data-offset-x="0" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
<div class="flexbox rtl row-reverse"> |
- <div data-expected-width="75" data-offset-x="0" style="-webkit-flex: 1 0 0; margin: 0 auto;"></div> |
- <div data-expected-width="350" data-offset-x="75" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="75"></div></div> |
- <div data-expected-width="75" data-offset-x="525" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-width="75" data-offset-x="0" style="flex: 1 0 0; margin: 0 auto;"></div> |
+ <div data-expected-width="350" data-offset-x="75" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-x="75"></div></div> |
+ <div data-expected-width="75" data-offset-x="525" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
<div style="position: relative;"> |
<div class="flexbox column"> |
- <div data-expected-height="150" data-offset-y="0" style="-webkit-flex: 1 0 0; margin: auto 200px auto 150px;"></div> |
- <div data-expected-height="300" data-offset-y="150" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="200"></div></div> |
- <div data-expected-height="150" data-offset-y="450" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-height="150" data-offset-y="0" style="flex: 1 0 0; margin: auto 200px auto 150px;"></div> |
+ <div data-expected-height="300" data-offset-y="150" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="200"></div></div> |
+ <div data-expected-height="150" data-offset-y="450" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div class="flexbox column-reverse"> |
- <div data-expected-height="150" data-offset-y="450" style="-webkit-flex: 1 0 0; margin: auto 200px auto 150px;"></div> |
- <div data-expected-height="300" data-offset-y="150" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="200"></div></div> |
- <div data-expected-height="150" data-offset-y="0" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-height="150" data-offset-y="450" style="flex: 1 0 0; margin: auto 200px auto 150px;"></div> |
+ <div data-expected-height="300" data-offset-y="150" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="200"></div></div> |
+ <div data-expected-height="150" data-offset-y="0" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div class="flexbox column rtl"> |
- <div data-expected-height="150" data-offset-y="0" data-offset-x="480" style="-webkit-flex: 1 0 0; margin: auto 100px auto 50px;"></div> |
- <div data-expected-height="300" data-offset-y="150" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="380"></div></div> |
- <div data-expected-height="150" data-offset-y="450" data-offset-x="580" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-height="150" data-offset-y="0" data-offset-x="480" style="flex: 1 0 0; margin: auto 100px auto 50px;"></div> |
+ <div data-expected-height="300" data-offset-y="150" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="380"></div></div> |
+ <div data-expected-height="150" data-offset-y="450" data-offset-x="580" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div class="flexbox column-reverse rtl"> |
- <div data-expected-height="150" data-offset-y="450" data-offset-x="480" style="-webkit-flex: 1 0 0; margin: auto 100px auto 50px;"></div> |
- <div data-expected-height="300" data-offset-y="150" style="-webkit-flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="380"></div></div> |
- <div data-expected-height="150" data-offset-y="0" data-offset-x="580" style="-webkit-flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
+ <div data-expected-height="150" data-offset-y="450" data-offset-x="480" style="flex: 1 0 0; margin: auto 100px auto 50px;"></div> |
+ <div data-expected-height="300" data-offset-y="150" style="flex: 2 0 0; -webkit-padding-start: 200px"><div data-offset-y="150" data-offset-x="380"></div></div> |
+ <div data-expected-height="150" data-offset-y="0" data-offset-x="580" style="flex: 1 0 0; -webkit-margin-end: 100px;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div data-expected-height="600" class="flexbox vertical-lr column"> |
- <div data-offset-x="0" data-expected-width="500" style="-webkit-flex: 1 0 0; min-width: 300px"></div> |
- <div data-offset-x="500" data-offset-y="100" data-expected-width="100" style="-webkit-flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
+ <div data-offset-x="0" data-expected-width="500" style="flex: 1 0 0; min-width: 300px"></div> |
+ <div data-offset-x="500" data-offset-y="100" data-expected-width="100" style="flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div data-expected-height="600" class="flexbox vertical-lr column-reverse"> |
- <div data-offset-x="100" data-expected-width="500" style="-webkit-flex: 1 0 0; min-width: 300px"></div> |
- <div data-offset-x="0" data-offset-y="100" data-expected-width="100" style="-webkit-flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
+ <div data-offset-x="100" data-expected-width="500" style="flex: 1 0 0; min-width: 300px"></div> |
+ <div data-offset-x="0" data-offset-y="100" data-expected-width="100" style="flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div data-expected-height="600" class="flexbox vertical-rl column"> |
- <div data-offset-x="100" data-expected-width="500" style="-webkit-flex: 1 0 0; min-width: 300px; margin-bottom: 100px"></div> |
- <div data-offset-x="0" data-offset-y="100" data-expected-width="100" style="-webkit-flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
+ <div data-offset-x="100" data-expected-width="500" style="flex: 1 0 0; min-width: 300px; margin-bottom: 100px"></div> |
+ <div data-offset-x="0" data-offset-y="100" data-expected-width="100" style="flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
</div> |
</div> |
<div style="position: relative;"> |
<div data-expected-height="600" class="flexbox vertical-rl column-reverse"> |
- <div data-offset-x="0" data-expected-width="500" style="-webkit-flex: 1 0 0; min-width: 300px; margin-bottom: 100px"></div> |
- <div data-offset-x="500" data-offset-y="100" data-expected-width="100" style="-webkit-flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
+ <div data-offset-x="0" data-expected-width="500" style="flex: 1 0 0; min-width: 300px; margin-bottom: 100px"></div> |
+ <div data-offset-x="500" data-offset-y="100" data-expected-width="100" style="flex: 1 0 200px; max-width: 100px; margin: 100px 0 50px 0;"></div> |
</div> |
</div> |