| Index: third_party/WebKit/LayoutTests/css3/flexbox/css-properties.html
|
| diff --git a/third_party/WebKit/LayoutTests/css3/flexbox/css-properties.html b/third_party/WebKit/LayoutTests/css3/flexbox/css-properties.html
|
| index b95bb5a14f55dec15088df2c3b7e19b67347aed1..75e796e38e8195519a221943978bbafb3418a466 100644
|
| --- a/third_party/WebKit/LayoutTests/css3/flexbox/css-properties.html
|
| +++ b/third_party/WebKit/LayoutTests/css3/flexbox/css-properties.html
|
| @@ -84,17 +84,17 @@ shouldBeEqualToString('flexbox.style.justifyContent', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).justifyContent', 'normal');
|
|
|
| shouldBeEqualToString('flexbox.style.alignSelf', '');
|
| -// 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', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).alignSelf', 'normal');
|
| +// The initial value is 'auto'.
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'auto');
|
| +shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).alignSelf', 'auto');
|
|
|
| flexbox.style.alignSelf = 'foo';
|
| shouldBeEqualToString('flexbox.style.alignSelf', '');
|
| -shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'auto');
|
|
|
| flexbox.style.alignSelf = 'auto';
|
| shouldBeEqualToString('flexbox.style.alignSelf', 'auto');
|
| -shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'auto');
|
|
|
| flexbox.style.alignSelf = 'flex-start';
|
| shouldBeEqualToString('flexbox.style.alignSelf', 'flex-start');
|
| @@ -118,26 +118,26 @@ shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'basel
|
|
|
| flexbox.style.alignSelf = '';
|
| shouldBeEqualToString('flexbox.style.alignSelf', '');
|
| -shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignSelf', 'auto');
|
|
|
| shouldBeEqualToString('flexbox.style.alignItems', '');
|
| shouldBeEqualToString('flexitem.style.alignSelf', '');
|
| -// The initial value is 'auto', which will be resolved to 'normal' in case of flexbox containers.
|
| +// The initial value is 'auto'.
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'auto');
|
|
|
| flexbox.style.alignItems = 'foo';
|
| shouldBeEqualToString('flexbox.style.alignItems', '');
|
| shouldBeEqualToString('flexitem.style.alignSelf', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'auto');
|
|
|
| // The 'auto' value is not valid for the align-items property.
|
| flexbox.style.alignItems = 'auto';
|
| shouldBeEqualToString('flexbox.style.alignItems', '');
|
| shouldBeEqualToString('flexitem.style.alignSelf', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'auto');
|
|
|
| flexbox.style.alignItems = 'flex-start';
|
| shouldBeEqualToString('flexbox.style.alignItems', 'flex-start');
|
| @@ -168,12 +168,12 @@ shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'base
|
| flexbox.style.alignItems = '';
|
| shouldBeEqualToString('flexbox.style.alignItems', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'auto');
|
|
|
| flexbox.style.display = 'none';
|
| shouldBeEqualToString('flexbox.style.alignItems', '');
|
| shouldBeEqualToString('window.getComputedStyle(flexbox, null).alignItems', 'normal');
|
| -shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'normal');
|
| +shouldBeEqualToString('window.getComputedStyle(flexitem, null).alignSelf', 'auto');
|
| flexbox.style.display = 'flex';
|
|
|
|
|
|
|