Index: LayoutTests/css3/flexbox/multiline-align-content.html |
diff --git a/LayoutTests/css3/flexbox/multiline-align-content.html b/LayoutTests/css3/flexbox/multiline-align-content.html |
index 13d7ee6865a6a6078b472672bb39e8e59482e171..9a0daa850f0a4e4f773f182d756c02c80cffd6a1 100644 |
--- a/LayoutTests/css3/flexbox/multiline-align-content.html |
+++ b/LayoutTests/css3/flexbox/multiline-align-content.html |
@@ -2,10 +2,10 @@ |
<html> |
<style> |
.flexbox { |
- display: -webkit-flex; |
+ display: flex; |
background-color: #aaa; |
position: relative; |
- -webkit-flex-wrap: wrap; |
+ flex-wrap: wrap; |
} |
.horizontal { |
@@ -75,42 +75,42 @@ |
<div data-offset-x="0" data-offset-y="80" data-expected-height="40"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: flex-start"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: flex-start"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="20" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="40" data-expected-height="20"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: flex-end"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: flex-end"> |
<div data-offset-x="0" data-offset-y="60" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="60" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="80" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="100" data-expected-height="20"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: center"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: center"> |
<div data-offset-x="0" data-offset-y="30" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="30" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="50" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="70" data-expected-height="20"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: space-between"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: space-between"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="50" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="100" data-expected-height="20"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: space-around"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: space-around"> |
<div data-offset-x="0" data-offset-y="10" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="10" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="50" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="90" data-expected-height="20"></div> |
</div> |
-<div data-expected-height="120" class="flexbox horizontal" style="-webkit-align-content: stretch"> |
+<div data-expected-height="120" class="flexbox horizontal" style="align-content: stretch"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="40"></div> |
<div data-offset-x="100" data-offset-y="0" data-expected-height="40"></div> |
<div data-offset-x="0" data-offset-y="40" data-expected-height="40"></div> |
@@ -118,7 +118,7 @@ |
</div> |
<!-- Negative overflow goes out the top. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: flex-end; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: flex-end; height: 30px"> |
<div data-offset-x="0" data-offset-y="-30" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="-30" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="-10" data-expected-height="20"></div> |
@@ -126,7 +126,7 @@ |
</div> |
<!-- If we overflow, we should true center. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: center; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: center; height: 30px"> |
<div data-offset-x="0" data-offset-y="-15" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="-15" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="5" data-expected-height="20"></div> |
@@ -134,7 +134,7 @@ |
</div> |
<!-- If we overflow, we should be the same as flex-start. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-between; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-between; height: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="20" data-expected-height="20"></div> |
@@ -142,7 +142,7 @@ |
</div> |
<!-- If we overflow, we should true center. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-around; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-around; height: 30px"> |
<div data-offset-x="0" data-offset-y="-15" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="-15" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="5" data-expected-height="20"></div> |
@@ -150,7 +150,7 @@ |
</div> |
<!-- Stretch should only grow, not shrink. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: stretch; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: stretch; height: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="100" data-offset-y="0" data-expected-height="20"></div> |
<div data-offset-x="0" data-offset-y="20" data-expected-height="20"></div> |
@@ -158,21 +158,21 @@ |
</div> |
<!-- 0 lines should not crash. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-between; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-between; height: 30px"> |
</div> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-around; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-around; height: 30px"> |
</div> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: stretch; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: stretch; height: 30px"> |
</div> |
<!-- 1 line should not crash. --> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-between; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-between; height: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="30"></div> |
</div> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: space-around; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: space-around; height: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="30"></div> |
</div> |
-<div data-expected-height="30" class="flexbox horizontal" style="-webkit-align-content: stretch; height: 30px"> |
+<div data-expected-height="30" class="flexbox horizontal" style="align-content: stretch; height: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-height="30"></div> |
</div> |
@@ -184,42 +184,42 @@ |
<div data-offset-x="0" data-offset-y="0" data-expected-width="40"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: flex-start"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: flex-start"> |
<div data-offset-x="100" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="100" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="80" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="60" data-offset-y="0" data-expected-width="20"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: flex-end"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: flex-end"> |
<div data-offset-x="40" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="40" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="20" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="0" data-offset-y="0" data-expected-width="20"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: center"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: center"> |
<div data-offset-x="70" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="70" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="50" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="30" data-offset-y="0" data-expected-width="20"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: space-between"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: space-between"> |
<div data-offset-x="100" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="100" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="50" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="0" data-offset-y="0" data-expected-width="20"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: space-around"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: space-around"> |
<div data-offset-x="90" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="90" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="50" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="10" data-offset-y="0" data-expected-width="20"></div> |
</div> |
-<div data-expected-width="120" class="flexbox vertical-rl" style="-webkit-align-content: stretch"> |
+<div data-expected-width="120" class="flexbox vertical-rl" style="align-content: stretch"> |
<div data-offset-x="80" data-offset-y="0" data-expected-width="40"></div> |
<div data-offset-x="80" data-offset-y="10" data-expected-width="40"></div> |
<div data-offset-x="40" data-offset-y="0" data-expected-width="40"></div> |
@@ -227,7 +227,7 @@ |
</div> |
<!-- Negative overflow goes out the right. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: flex-end; width: 30px;"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: flex-end; width: 30px;"> |
<div data-offset-x="40" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="40" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="20" data-offset-y="0" data-expected-width="20"></div> |
@@ -235,7 +235,7 @@ |
</div> |
<!-- If we overflow, we should true center. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: center; width: 30px;"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: center; width: 30px;"> |
<div data-offset-x="25" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="25" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="5" data-offset-y="0" data-expected-width="20"></div> |
@@ -243,7 +243,7 @@ |
</div> |
<!-- If we overflow, we should be the same as flex-start. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-between; width: 30px;"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-between; width: 30px;"> |
<div data-offset-x="10" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="10" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="-10" data-offset-y="0" data-expected-width="20"></div> |
@@ -251,7 +251,7 @@ |
</div> |
<!-- If we overflow, we should true center. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-around; width: 30px;"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-around; width: 30px;"> |
<div data-offset-x="25" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="25" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="5" data-offset-y="0" data-expected-width="20"></div> |
@@ -259,7 +259,7 @@ |
</div> |
<!-- Stretch should only grow, not shrink. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: stretch; width: 30px;"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: stretch; width: 30px;"> |
<div data-offset-x="10" data-offset-y="0" data-expected-width="20"></div> |
<div data-offset-x="10" data-offset-y="10" data-expected-width="20"></div> |
<div data-offset-x="-10" data-offset-y="0" data-expected-width="20"></div> |
@@ -267,21 +267,21 @@ |
</div> |
<!-- 0 lines should not crash. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-between; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-between; width: 30px"> |
</div> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-around; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-around; width: 30px"> |
</div> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: stretch; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: stretch; width: 30px"> |
</div> |
<!-- 1 line should not crash. --> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-between; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-between; width: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-width="30"></div> |
</div> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: space-around; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: space-around; width: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-width="30"></div> |
</div> |
-<div data-expected-width="30" class="flexbox vertical-rl" style="-webkit-align-content: stretch; width: 30px"> |
+<div data-expected-width="30" class="flexbox vertical-rl" style="align-content: stretch; width: 30px"> |
<div data-offset-x="0" data-offset-y="0" data-expected-width="30"></div> |
</div> |
</body> |