| 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..bfc1a2e44086de2c9c3b1839a886ea58f4fc666b 100644
|
| --- a/LayoutTests/css3/flexbox/css-properties.html
|
| +++ b/LayoutTests/css3/flexbox/css-properties.html
|
| @@ -27,6 +27,7 @@ shouldBeEqualToString('flexbox.style.display', '-webkit-inline-flex');
|
| flexbox.style.display = 'block';
|
| shouldBeEqualToString('flexbox.style.display', 'block');
|
|
|
| +flexbox.style.display = 'flex';
|
|
|
| var flexitem = document.getElementById("flexitem");
|
| shouldBeEqualToString('flexitem.style.webkitOrder', '');
|
| @@ -78,18 +79,18 @@ flexbox.style.webkitJustifyContent = '';
|
| shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'flex-start');
|
|
|
| -
|
| 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).alignSelf', 'start');
|
| +shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).alignSelf', 'start');
|
|
|
| flexbox.style.webkitAlignSelf = 'foo';
|
| shouldBeEqualToString('flexbox.style.webkitAlignSelf', '');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'start');
|
|
|
| flexbox.style.webkitAlignSelf = 'auto';
|
| shouldBeEqualToString('flexbox.style.webkitAlignSelf', 'auto');
|
| -shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignSelf', 'stretch');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'start');
|
|
|
| flexbox.style.webkitAlignSelf = 'flex-start';
|
| shouldBeEqualToString('flexbox.style.webkitAlignSelf', 'flex-start');
|
| @@ -113,23 +114,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).alignSelf', 'start');
|
|
|
| shouldBeEqualToString('flexbox.style.webkitAlignItems', '');
|
| -// The initial value is 'stretch'.
|
| -shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignItems', 'stretch');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitAlignSelf', 'stretch');
|
| +shouldBeEqualToString('flexitem.style.alignSelf', '');
|
| +// The initial value is 'auto', which will be resolved to 'stretch' in case of flexbox containers.
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'stretch');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'stretch');
|
|
|
| flexbox.style.webkitAlignItems = 'foo';
|
| shouldBeEqualToString('flexbox.style.webkitAlignItems', '');
|
| +shouldBeEqualToString('flexitem.style.alignSelf', '');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'stretch');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', '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.alignSelf', '');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'stretch');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', '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 +167,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).alignItems', 'start');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'start');
|
| flexbox.style.display = '';
|
|
|
|
|
|
|