Index: LayoutTests/css3/flexbox/css-properties.html |
diff --git a/LayoutTests/css3/flexbox/css-properties.html b/LayoutTests/css3/flexbox/css-properties.html |
index ed7c562d5fc72457b001823fb453cb8fc003223e..d31372ce57abf6b008f6afdef6b5d5027db37d8d 100644 |
--- a/LayoutTests/css3/flexbox/css-properties.html |
+++ b/LayoutTests/css3/flexbox/css-properties.html |
@@ -78,18 +78,20 @@ flexbox.style.webkitJustifyContent = ''; |
shouldBeEqualToString('flexbox.style.webkitJustifyContent', ''); |
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'flex-start'); |
+flexbox.style.display = '-webkit-flex'; |
Julien - ping for review
2014/07/22 01:56:59
Let's use the unprefixed version as we support it.
jfernandez
2014/07/23 21:42:26
Acknowledged.
|
shouldBeEqualToString('flexbox.style.webkitAlignSelf', ''); |
-// The initial value is 'stretch'. |
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'stretch'); |
-shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).webkitAlignSelf', 'stretch'); |
+// The initial value is 'auto', which will be resolved depending on parent's style (except for the 'document' element). |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'start'); |
+shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).webkitAlignSelf', 'auto'); |
Julien - ping for review
2014/07/22 01:56:59
While we touched these lines, I would unprefix the
jfernandez
2014/07/23 21:42:26
Done.
|
flexbox.style.webkitAlignSelf = 'foo'; |
shouldBeEqualToString('flexbox.style.webkitAlignSelf', ''); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'start'); |
flexbox.style.webkitAlignSelf = 'auto'; |
shouldBeEqualToString('flexbox.style.webkitAlignSelf', 'auto'); |
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'stretch'); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'start'); |
flexbox.style.webkitAlignSelf = 'flex-start'; |
shouldBeEqualToString('flexbox.style.webkitAlignSelf', 'flex-start'); |
@@ -113,23 +115,29 @@ shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', |
flexbox.style.webkitAlignSelf = ''; |
shouldBeEqualToString('flexbox.style.webkitAlignSelf', ''); |
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'stretch'); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'start'); |
shouldBeEqualToString('flexbox.style.webkitAlignItems', ''); |
-// The initial value is 'stretch'. |
+shouldBeEqualToString('flexitem.style.webkitAlignSelf', ''); |
+// The initial value is 'auto', which will be resolved to 'stretch' in case of flexbox containers. |
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'stretch'); |
shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'stretch'); |
flexbox.style.webkitAlignItems = 'foo'; |
shouldBeEqualToString('flexbox.style.webkitAlignItems', ''); |
+shouldBeEqualToString('flexitem.style.webkitAlignSelf', ''); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'stretch'); |
+shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'stretch'); |
flexbox.style.webkitAlignItems = 'auto'; |
shouldBeEqualToString('flexbox.style.webkitAlignItems', 'auto'); |
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'auto'); |
-shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'auto'); |
+shouldBeEqualToString('flexitem.style.webkitAlignSelf', ''); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'stretch'); |
+shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'stretch'); |
flexbox.style.webkitAlignItems = 'flex-start'; |
shouldBeEqualToString('flexbox.style.webkitAlignItems', 'flex-start'); |
+shouldBeEqualToString('flexitem.style.webkitAlignSelf', ''); |
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'flex-start'); |
shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'flex-start'); |
@@ -160,8 +168,8 @@ shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', |
flexbox.style.display = 'none'; |
shouldBeEqualToString('flexbox.style.webkitAlignItems', ''); |
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'stretch'); |
-shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'stretch'); |
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'start'); |
+shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'start'); |
flexbox.style.display = ''; |