| Index: third_party/WebKit/LayoutTests/fast/alignment/parse-align-items.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/alignment/parse-align-items.html b/third_party/WebKit/LayoutTests/fast/alignment/parse-align-items.html
|
| index c72fe0769247208da2028d3ad8c937f8044d88fa..99a083fd03a5c31963cc1af4b48b5e675155b78b 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/alignment/parse-align-items.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/alignment/parse-align-items.html
|
| @@ -50,12 +50,12 @@
|
| align-items: flex-end;
|
| }
|
|
|
| -#alignItemsEndTrue {
|
| - align-items: end true;
|
| +#alignItemsEndUnsafe {
|
| + align-items: end unsafe;
|
| }
|
|
|
| -#alignItemsCenterTrue {
|
| - align-items: center true;
|
| +#alignItemsCenterUnsafe {
|
| + align-items: center unsafe;
|
| }
|
|
|
| #alignItemsSelfEndSafe {
|
| @@ -70,12 +70,12 @@
|
| align-items: right safe;
|
| }
|
|
|
| -#alignItemsLeftTrue {
|
| - align-items: left true;
|
| +#alignItemsLeftUnsafe {
|
| + align-items: left unsafe;
|
| }
|
|
|
| -#alignItemsFlexStartTrue {
|
| - align-items: flex-start true;
|
| +#alignItemsFlexStartUnsafe {
|
| + align-items: flex-start unsafe;
|
| }
|
|
|
| #alignItemsFlexEndSafe {
|
| @@ -99,13 +99,13 @@
|
| <div id="alignItemsFlexStart"></div>
|
| <div id="alignItemsFlexEnd"></div>
|
|
|
| -<div id="alignItemsEndTrue"></div>
|
| -<div id="alignItemsCenterTrue"></div>
|
| +<div id="alignItemsEndUnsafe"></div>
|
| +<div id="alignItemsCenterUnsafe"></div>
|
| <div id="alignItemsSelfEndSafe"></div>
|
| <div id="alignItemsSelfStartSafe"></div>
|
| <div id="alignItemsRightSafe"></div>
|
| -<div id="alignItemsLeftTrue"></div>
|
| -<div id="alignItemsFlexStartTrue"></div>
|
| +<div id="alignItemsLeftUnsafe"></div>
|
| +<div id="alignItemsFlexStartUnsafe"></div>
|
| <div id="alignItemsFlexEndSafe"></div>
|
| <script src="resources/alignment-parsing-utils.js"></script>
|
| <script>
|
| @@ -148,11 +148,11 @@ shouldBe("getComputedStyle(alignItemsFlexStart, '').getPropertyValue('align-item
|
| var alignItemsFlexEnd = document.getElementById("alignItemsFlexEnd");
|
| shouldBe("getComputedStyle(alignItemsFlexEnd, '').getPropertyValue('align-items')", "'flex-end'");
|
|
|
| -var alignItemsEndTrue = document.getElementById("alignItemsEndTrue");
|
| -shouldBe("getComputedStyle(alignItemsEndTrue, '').getPropertyValue('align-items')", "'end true'");
|
| +var alignItemsEndUnsafe = document.getElementById("alignItemsEndUnsafe");
|
| +shouldBe("getComputedStyle(alignItemsEndUnsafe, '').getPropertyValue('align-items')", "'end unsafe'");
|
|
|
| -var alignItemsCenterTrue = document.getElementById("alignItemsCenterTrue");
|
| -shouldBe("getComputedStyle(alignItemsCenterTrue, '').getPropertyValue('align-items')", "'center true'");
|
| +var alignItemsCenterUnsafe = document.getElementById("alignItemsCenterUnsafe");
|
| +shouldBe("getComputedStyle(alignItemsCenterUnsafe, '').getPropertyValue('align-items')", "'center unsafe'");
|
|
|
| var alignItemsSelfEndSafe = document.getElementById("alignItemsSelfEndSafe");
|
| shouldBe("getComputedStyle(alignItemsSelfEndSafe, '').getPropertyValue('align-items')", "'self-end safe'");
|
| @@ -163,11 +163,11 @@ shouldBe("getComputedStyle(alignItemsSelfStartSafe, '').getPropertyValue('align-
|
| var alignItemsRightSafe = document.getElementById("alignItemsRightSafe");
|
| shouldBe("getComputedStyle(alignItemsRightSafe, '').getPropertyValue('align-items')", "'right safe'");
|
|
|
| -var alignItemsLeftTrue = document.getElementById("alignItemsLeftTrue");
|
| -shouldBe("getComputedStyle(alignItemsLeftTrue, '').getPropertyValue('align-items')", "'left true'");
|
| +var alignItemsLeftUnsafe = document.getElementById("alignItemsLeftUnsafe");
|
| +shouldBe("getComputedStyle(alignItemsLeftUnsafe, '').getPropertyValue('align-items')", "'left unsafe'");
|
|
|
| -var alignItemsFlexStartTrue = document.getElementById("alignItemsFlexStartTrue");
|
| -shouldBe("getComputedStyle(alignItemsFlexStartTrue, '').getPropertyValue('align-items')", "'flex-start true'");
|
| +var alignItemsFlexStartUnsafe = document.getElementById("alignItemsFlexStartUnsafe");
|
| +shouldBe("getComputedStyle(alignItemsFlexStartUnsafe, '').getPropertyValue('align-items')", "'flex-start unsafe'");
|
|
|
| var alignItemsFlexEndSafe = document.getElementById("alignItemsFlexEndSafe");
|
| shouldBe("getComputedStyle(alignItemsFlexEndSafe, '').getPropertyValue('align-items')", "'flex-end safe'");
|
| @@ -185,8 +185,8 @@ document.body.appendChild(element);
|
| element.style.alignItems = "center";
|
| checkValues(element, "alignItems", "align-items", "center", "center");
|
|
|
| -element.style.alignItems = "true start";
|
| -checkValues(element, "alignItems", "align-items", "start true", "start true");
|
| +element.style.alignItems = "unsafe start";
|
| +checkValues(element, "alignItems", "align-items", "start unsafe", "start unsafe");
|
|
|
| element.style.alignItems = "flex-end safe";
|
| checkValues(element, "alignItems", "align-items", "flex-end safe", "flex-end safe");
|
| @@ -219,26 +219,26 @@ debug("Test bad combinations of align-items");
|
| element = document.createElement("div");
|
| document.body.appendChild(element);
|
|
|
| -checkBadValues(element, "alignItems", "align-items", "true auto");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe auto");
|
| checkBadValues(element, "alignItems", "align-items", "auto safe");
|
| checkBadValues(element, "alignItems", "align-items", "auto left");
|
| checkBadValues(element, "alignItems", "align-items", "baseline safe");
|
| checkBadValues(element, "alignItems", "align-items", "baseline center");
|
| -checkBadValues(element, "alignItems", "align-items", "stretch true");
|
| +checkBadValues(element, "alignItems", "align-items", "stretch unsafe");
|
| checkBadValues(element, "alignItems", "align-items", "stretch right");
|
| -checkBadValues(element, "alignItems", "align-items", "true true");
|
| -checkBadValues(element, "alignItems", "align-items", "true safe");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe unsafe");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe safe");
|
| checkBadValues(element, "alignItems", "align-items", "center start");
|
| -checkBadValues(element, "alignItems", "align-items", "stretch true");
|
| +checkBadValues(element, "alignItems", "align-items", "stretch unsafe");
|
| checkBadValues(element, "alignItems", "align-items", "safe stretch");
|
| checkBadValues(element, "alignItems", "align-items", "baseline safe");
|
| -checkBadValues(element, "alignItems", "align-items", "true baseline");
|
| -checkBadValues(element, "alignItems", "align-items", "true safe left");
|
| -checkBadValues(element, "alignItems", "align-items", "true left safe");
|
| -checkBadValues(element, "alignItems", "align-items", "left safe true safe");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe baseline");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe safe left");
|
| +checkBadValues(element, "alignItems", "align-items", "unsafe left safe");
|
| +checkBadValues(element, "alignItems", "align-items", "left safe unsafe safe");
|
| checkBadValues(element, "alignItems", "align-items", "legacy start");
|
| checkBadValues(element, "alignItems", "align-items", "legacy end");
|
| -checkBadValues(element, "alignItems", "align-items", "legacy right true");
|
| +checkBadValues(element, "alignItems", "align-items", "legacy right unsafe");
|
| checkBadValues(element, "alignItems", "align-items", "legacy auto");
|
| checkBadValues(element, "alignItems", "align-items", "legacy stretch");
|
| checkBadValues(element, "alignItems", "align-items", "legacy");
|
| @@ -257,13 +257,13 @@ checkInitialValues(element, "alignItems", "align-items", "left safe", "stretch")
|
| debug("");
|
| debug("Test the value 'initial' for flex containers");
|
| element.style.display = "flex";
|
| -checkInitialValues(element, "alignItems", "align-items", "right true", "stretch");
|
| +checkInitialValues(element, "alignItems", "align-items", "right unsafe", "stretch");
|
|
|
| debug("");
|
| debug("Test the value 'inherit'");
|
| checkInheritValues("alignItems", "align-items", "end");
|
| checkInheritValues("alignItems", "align-items", "left safe");
|
| -checkInheritValues("alignItems", "align-items", "center true");
|
| +checkInheritValues("alignItems", "align-items", "center unsafe");
|
|
|
| </script>
|
| </body>
|
|
|