Index: LayoutTests/css3/flexbox/multiline.html |
diff --git a/LayoutTests/css3/flexbox/multiline.html b/LayoutTests/css3/flexbox/multiline.html |
index 29303aa03d1e66a8000ecfdaa69009962807a004..43b4ab504dff7b3bada5f0caf170596cd221c406 100644 |
--- a/LayoutTests/css3/flexbox/multiline.html |
+++ b/LayoutTests/css3/flexbox/multiline.html |
@@ -3,13 +3,13 @@ |
<style> |
.flexbox { |
position: relative; |
- display: -webkit-flex; |
+ display: flex; |
background-color: grey; |
max-width: 600px; |
- -webkit-align-content: flex-start; |
+ align-content: flex-start; |
} |
.flexbox > * { |
- -webkit-flex: none; |
+ flex: none; |
} |
.title { |
margin-top: 1em; |
@@ -33,22 +33,22 @@ |
-webkit-writing-mode: vertical-lr; |
} |
.row { |
- -webkit-flex-flow: row; |
+ flex-flow: row; |
} |
.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; |
} |
.wrap { |
- -webkit-flex-wrap: wrap; |
+ flex-wrap: wrap; |
} |
.wrap-reverse { |
- -webkit-flex-wrap: wrap-reverse; |
+ flex-wrap: wrap-reverse; |
} |
.flexbox > :nth-child(1) { |
background-color: #0f0; |
@@ -700,7 +700,7 @@ function mainAxisDirection(writingMode, flexDirection) |
function addChild(flexbox, mainAxis, crossAxis, preferredSize, crossAxisLength, expectations) |
{ |
var child = document.createElement('div'); |
- child.setAttribute('style', '-webkit-flex: 1 0 ' + preferredSize + 'px;' |
+ child.setAttribute('style', 'flex: 1 0 ' + preferredSize + 'px;' |
+ crossAxis + ': ' + crossAxisLength + 'px;'); |
child.setAttribute("data-expected-width", expectations[0]); |