Index: LayoutTests/css3/flexbox/multiline-reverse-wrap-overflow.html |
diff --git a/LayoutTests/css3/flexbox/multiline-reverse-wrap-overflow.html b/LayoutTests/css3/flexbox/multiline-reverse-wrap-overflow.html |
index 9123fde8e9e338d2c084d55fadbf7cc0532e8162..883a761038acd0f2c86f703cb5a266d0f78bdd4f 100644 |
--- a/LayoutTests/css3/flexbox/multiline-reverse-wrap-overflow.html |
+++ b/LayoutTests/css3/flexbox/multiline-reverse-wrap-overflow.html |
@@ -2,12 +2,12 @@ |
<html> |
<style> |
.flexbox { |
- display: -webkit-flex; |
+ display: flex; |
background-color: #aaa; |
position: relative; |
- -webkit-flex-wrap: wrap-reverse; |
+ flex-wrap: wrap-reverse; |
margin-top: 20px; |
- -webkit-align-content: flex-start; |
+ align-content: flex-start; |
} |
.flexbox > div { |
border: 0; |
@@ -32,46 +32,46 @@ |
sizing is not auto.</p> |
<div data-expected-width="200" data-expected-height="35" class="flexbox" style="width: 200px; height: 35px;"> |
- <div data-offset-x="0" data-offset-y="15" style="-webkit-flex: 1 100px; height: 20px"></div> |
- <div data-offset-x="100" data-offset-y="25" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="0" data-offset-y="5" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="100" data-offset-y="-5" style="-webkit-flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="0" data-offset-y="15" style="flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="100" data-offset-y="25" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="0" data-offset-y="5" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="100" data-offset-y="-5" style="flex: 1 100px; height: 20px"></div> |
</div> |
<div data-expected-width="200" data-expected-height="35" class="flexbox" style="width: 200px; max-height: 35px;"> |
- <div data-offset-x="0" data-offset-y="15" style="-webkit-flex: 1 100px; height: 20px"></div> |
- <div data-offset-x="100" data-offset-y="25" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="0" data-offset-y="5" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="100" data-offset-y="-5" style="-webkit-flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="0" data-offset-y="15" style="flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="100" data-offset-y="25" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="0" data-offset-y="5" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="100" data-offset-y="-5" style="flex: 1 100px; height: 20px"></div> |
</div> |
<div data-expected-width="200" data-expected-height="50" class="flexbox" style="width: 200px; min-height: 50px;"> |
- <div data-offset-x="0" data-offset-y="30" style="-webkit-flex: 1 100px; height: 20px"></div> |
- <div data-offset-x="100" data-offset-y="40" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="0" data-offset-y="20" style="-webkit-flex: 1 100px; height: 10px"></div> |
- <div data-offset-x="100" data-offset-y="10" style="-webkit-flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="0" data-offset-y="30" style="flex: 1 100px; height: 20px"></div> |
+ <div data-offset-x="100" data-offset-y="40" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="0" data-offset-y="20" style="flex: 1 100px; height: 10px"></div> |
+ <div data-offset-x="100" data-offset-y="10" style="flex: 1 100px; height: 20px"></div> |
</div> |
-<div data-expected-width="35" data-expected-height="200" class="flexbox" style="-webkit-flex-direction: column; height: 200px; width: 35px"> |
- <div data-offset-x="15" data-offset-y="0" style="-webkit-flex: 1 100px; width: 20px"></div> |
- <div data-offset-x="25" data-offset-y="100" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="5" data-offset-y="0" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="-5" data-offset-y="100" style="-webkit-flex: 1 100px; width: 20px"></div> |
+<div data-expected-width="35" data-expected-height="200" class="flexbox" style="flex-direction: column; height: 200px; width: 35px"> |
+ <div data-offset-x="15" data-offset-y="0" style="flex: 1 100px; width: 20px"></div> |
+ <div data-offset-x="25" data-offset-y="100" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="5" data-offset-y="0" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="-5" data-offset-y="100" style="flex: 1 100px; width: 20px"></div> |
</div> |
-<div data-expected-width="35" data-expected-height="200" class="flexbox" style="-webkit-flex-direction: column; height: 200px; max-width: 35px"> |
- <div data-offset-x="15" data-offset-y="0" style="-webkit-flex: 1 100px; width: 20px"></div> |
- <div data-offset-x="25" data-offset-y="100" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="5" data-offset-y="0" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="-5" data-offset-y="100" style="-webkit-flex: 1 100px; width: 20px"></div> |
+<div data-expected-width="35" data-expected-height="200" class="flexbox" style="flex-direction: column; height: 200px; max-width: 35px"> |
+ <div data-offset-x="15" data-offset-y="0" style="flex: 1 100px; width: 20px"></div> |
+ <div data-offset-x="25" data-offset-y="100" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="5" data-offset-y="0" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="-5" data-offset-y="100" style="flex: 1 100px; width: 20px"></div> |
</div> |
-<div data-expected-width="600" data-expected-height="200" class="flexbox" style="-webkit-flex-direction: column; height: 200px; min-width: 50px; max-width: 600px"> |
- <div data-offset-x="580" data-offset-y="0" style="-webkit-flex: 1 100px; width: 20px"></div> |
- <div data-offset-x="590" data-offset-y="100" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="570" data-offset-y="0" style="-webkit-flex: 1 100px; width: 10px"></div> |
- <div data-offset-x="560" data-offset-y="100" style="-webkit-flex: 1 100px; width: 20px"></div> |
+<div data-expected-width="600" data-expected-height="200" class="flexbox" style="flex-direction: column; height: 200px; min-width: 50px; max-width: 600px"> |
+ <div data-offset-x="580" data-offset-y="0" style="flex: 1 100px; width: 20px"></div> |
+ <div data-offset-x="590" data-offset-y="100" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="570" data-offset-y="0" style="flex: 1 100px; width: 10px"></div> |
+ <div data-offset-x="560" data-offset-y="100" style="flex: 1 100px; width: 20px"></div> |
</div> |
</body> |