WebKit
diff --git a/‎LayoutTests/ChangeLog
+15 b/‎LayoutTests/ChangeLog
+15
diff --git a/‎LayoutTests/css3/parse-align-content.html
+9-39 b/‎LayoutTests/css3/parse-align-content.html
+9-39
diff --git a/‎LayoutTests/css3/parse-align-items.html
+8-35 b/‎LayoutTests/css3/parse-align-items.html
+8-35
diff --git a/‎LayoutTests/css3/parse-align-self-expected.txt
+1-1 b/‎LayoutTests/css3/parse-align-self-expected.txt
+1-1
@@ -1,3 +1,18 @@
+2018-01-23  Javier Fernandez  <[email protected]>
+
+        [css-align] 'left' and 'right' should parse as invalid in block/cross-axis alignment
+        https://bugs.webkit.org/show_bug.cgi?id=181792
+
+        Reviewed by Antti Koivisto.
+
+        Rebaseline tests because of the removal of the 'left' and right' CSS values.
+
+        * css3/parse-align-content.html:
+        * css3/parse-align-items.html:
+        * css3/parse-align-self-expected.txt:
+        * css3/parse-align-self.html:
+        * css3/parse-alignment-of-root-elements-expected.txt:
+
 2018-01-23  Simon Fraser  <[email protected]>
 
         Element with position:fixed stops scrolling at the bottom of the page, but is painted in the right place on Chacos.com.
 
@@ -44,13 +44,6 @@
     align-content: center;
 }
 
-#alignContentLeft {
-    align-content: left;
-}
-
-#alignContentRight {
-    align-content: right;
-}
 
 #alignContentFlexStart {
     align-content: flex-start;
@@ -68,14 +61,6 @@
     align-content: unsafe center ;
 }
 
-#alignContentSafeRight {
-    align-content: safe right;
-}
-
-#alignContentUnsafeLeft {
-    align-content: unsafe left;
-}
-
 #alignContentUnsafeFlexStart {
     align-content: unsafe flex-start;
 }
@@ -141,22 +126,16 @@
 <div id="alignContentStart"></div>
 <div id="alignContentEnd"></div>
 <div id="alignContentCenter"></div>
-<div id="alignContentLeft"></div>
-<div id="alignContentRight"></div>
 <div id="alignContentFlexStart"></div>
 <div id="alignContentFlexEnd"></div>
 <div id="alignContentUnsafeEnd"></div>
 <div id="alignContentUnsafeCenter"></div>
 <div id="alignContentSafeSelfEnd"></div>
 <div id="alignContentSafeSelfStart"></div>
-<div id="alignContentSafeRight"></div>
-<div id="alignContentUnsafeLeft"></div>
 <div id="alignContentUnsafeFlexStart"></div>
 <div id="alignContentSafeFlexEnd"></div>
 <div id="alignContentEndUnsafe"></div>
 <div id="alignContentCenterUnsafe"></div>
-<div id="alignContentRightSafe"></div>
-<div id="alignContentLeftUnsafe"></div>
 <div id="alignContentFlexStartUnsafe"></div>
 <div id="alignContentFlexEndSafe"></div>
 
@@ -199,10 +178,6 @@
     checkValues(alignContentEnd, "alignContent", "align-content", "", "end");
     var alignContentCenter = document.getElementById("alignContentCenter");
     checkValues(alignContentCenter, "alignContent", "align-content", "", "center");
-    var alignContentLeft = document.getElementById("alignContentLeft");
-    checkValues(alignContentLeft, "alignContent", "align-content", "", "left");
-    var alignContentRight = document.getElementById("alignContentRight");
-    checkValues(alignContentRight, "alignContent", "align-content", "", "right");
     var alignContentFlexStart = document.getElementById("alignContentFlexStart");
     checkValues(alignContentFlexStart, "alignContent", "align-content", "", "flex-start");
     var alignContentFlexEnd = document.getElementById("alignContentFlexEnd");
@@ -211,10 +186,6 @@
     checkValues(alignContentUnsafeEnd, "alignContent", "align-content", "", "unsafe end");
     var alignContentUnsafeCenter = document.getElementById("alignContentUnsafeCenter");
     checkValues(alignContentUnsafeCenter, "alignContent", "align-content", "", "unsafe center");
-    var alignContentSafeRight = document.getElementById("alignContentSafeRight");
-    checkValues(alignContentSafeRight, "alignContent", "align-content", "", "safe right");
-    var alignContentUnsafeLeft = document.getElementById("alignContentUnsafeLeft");
-    checkValues(alignContentUnsafeLeft, "alignContent", "align-content", "", "unsafe left");
     var alignContentUnsafeFlexStart = document.getElementById("alignContentUnsafeFlexStart");
     checkValues(alignContentUnsafeFlexStart, "alignContent", "align-content", "", "unsafe flex-start");
     var alignContentSafeFlexEnd = document.getElementById("alignContentSafeFlexEnd");
@@ -226,10 +197,6 @@
     checkValues(alignContentEndUnsafe, "alignContent", "align-content", "", "normal");
     var alignContentCenterUnsafe = document.getElementById("alignContentCenterUnsafe");
     checkValues(alignContentCenterUnsafe, "alignContent", "align-content", "", "normal");
-    var alignContentRightSafe = document.getElementById("alignContentRightSafe");
-    checkValues(alignContentRightSafe, "alignContent", "align-content", "", "normal");
-    var alignContentLeftUnsafe = document.getElementById("alignContentLeftUnsafe");
-    checkValues(alignContentLeftUnsafe, "alignContent", "align-content", "", "normal");
     var alignContentFlexStartUnsafe = document.getElementById("alignContentFlexStartUnsafe");
     checkValues(alignContentFlexStartUnsafe, "alignContent", "align-content", "", "normal");
     var alignContentFlexEndSafe = document.getElementById("alignContentFlexEndSafe");
@@ -276,8 +243,8 @@
     element.style.alignContent = "safe flex-end";
     checkValues(element, "alignContent", "align-content",  "safe flex-end", "safe flex-end");
 
-    element.style.alignContent = " unsafe right";
-    checkValues(element, "alignContent", "align-content",  "unsafe right", "unsafe right");
+    element.style.alignContent = "unsafe end";
+    checkValues(element, "alignContent", "align-content",  "unsafe end", "unsafe end");
 
     element.style.justifyContent = "first baseline";
     checkValues(element, "justifyContent", "justify-content",  "first baseline", "baseline");
@@ -304,11 +271,14 @@
     element = document.createElement("div");
     document.body.appendChild(element);
 
-    checkBadValues(element, "alignContent", "align-content",  "");
+    checkBadValues(element, "alignContent", "align-content",  "left");
+    checkBadValues(element, "alignContent", "align-content",  "right");
     checkBadValues(element, "alignContent", "align-content",  "auto");
     checkBadValues(element, "alignContent", "align-content",  "unsafe auto");
     checkBadValues(element, "alignContent", "align-content",  "auto safe");
     checkBadValues(element, "alignContent", "align-content",  "auto left");
+    checkBadValues(element, "alignContent", "align-content",  "safe left");
+    checkBadValues(element, "alignContent", "align-content",  "unsafe right");
     checkBadValues(element, "alignContent", "align-content",  "baseline safe");
     checkBadValues(element, "alignContent", "align-content",  "last-baseline center");
     checkBadValues(element, "alignContent", "align-content",  "unsafe unsafe");
@@ -342,17 +312,17 @@
 
 test(function() {
     element.style.display = "grid";
-    checkInitialValues(element, "alignContent", "align-content", "safe left", "normal");
+    checkInitialValues(element, "alignContent", "align-content", "safe start", "normal");
 }, "Test the value 'initial' for grid containers");
 
 test(function() {
     element.style.display = "flex";
-    checkInitialValues(element, "alignContent", "align-content", "unsafe right", "normal");
+    checkInitialValues(element, "alignContent", "align-content", "unsafe end", "normal");
 }, "Test the value 'initial' for flex containers");
 
 test(function() {
     checkInheritValues("alignContent", "align-content", "end");
-    checkInheritValues("alignContent", "align-content", "safe left");
+    checkInheritValues("alignContent", "align-content", "safe start");
     checkInheritValues("alignContent", "align-content", "unsafe center");
 }, "Test the value 'inherit'");
 </script>
@@ -40,14 +40,6 @@
     align-items: self-end;
 }
 
-#alignItemsLeft {
-    align-items: left;
-}
-
-#alignItemsRight {
-    align-items: right;
-}
-
 #alignItemsFlexStart {
     align-items: flex-start;
 }
@@ -72,14 +64,6 @@
     align-items: safe self-start;
 }
 
-#alignItemsSafeRight {
-    align-items: safe right;
-}
-
-#alignItemsUnsafeLeft {
-    align-items: unsafe left;
-}
-
 #alignItemsUnsafeFlexStart {
     align-items: unsafe flex-start;
 }
@@ -99,17 +83,13 @@
 <div id="alignItemsCenter"></div>
 <div id="alignItemsSelfStart"></div>
 <div id="alignItemsSelfEnd"></div>
-<div id="alignItemsLeft"></div>
-<div id="alignItemsRight"></div>
 <div id="alignItemsFlexStart"></div>
 <div id="alignItemsFlexEnd"></div>
 
 <div id="alignItemsUnsafeEnd"></div>
 <div id="alignItemsUnsafeCenter"></div>
 <div id="alignItemsSafeSelfEnd"></div>
 <div id="alignItemsSafeSelfStart"></div>
-<div id="alignItemsSafeRight"></div>
-<div id="alignItemsUnsafeLeft"></div>
 <div id="alignItemsUnsafeFlexStart"></div>
 <div id="alignItemsSafeFlexEnd"></div>
 <script src="../resources/testharness.js"></script>
@@ -137,10 +117,6 @@
     checkValues(alignItemsSelfEnd, "alignItems", "align-items", "", "self-end");
     var alignItemsSelfStart = document.getElementById("alignItemsSelfStart");
     checkValues(alignItemsSelfStart, "alignItems", "align-items", "", "self-start");
-    var alignItemsLeft = document.getElementById("alignItemsLeft");
-    checkValues(alignItemsLeft, "alignItems", "align-items", "", "left");
-    var alignItemsRight = document.getElementById("alignItemsRight");
-    checkValues(alignItemsRight, "alignItems", "align-items", "", "right");
     var alignItemsFlexStart = document.getElementById("alignItemsFlexStart");
     checkValues(alignItemsFlexStart, "alignItems", "align-items", "", "flex-start");
     var alignItemsFlexEnd = document.getElementById("alignItemsFlexEnd");
@@ -154,10 +130,6 @@
     checkValues(alignItemsSafeSelfEnd, "alignItems", "align-items", "", "safe self-end");
     var alignItemsSafeSelfStart = document.getElementById("alignItemsSafeSelfStart");
     checkValues(alignItemsSafeSelfStart, "alignItems", "align-items", "", "safe self-start");
-    var alignItemsSafeRight = document.getElementById("alignItemsSafeRight");
-    checkValues(alignItemsSafeRight, "alignItems", "align-items", "", "safe right");
-    var alignItemsUnsafeLeft = document.getElementById("alignItemsUnsafeLeft");
-    checkValues(alignItemsUnsafeLeft, "alignItems", "align-items", "", "unsafe left");
     var alignItemsUnsafeFlexStart = document.getElementById("alignItemsUnsafeFlexStart");
     checkValues(alignItemsUnsafeFlexStart, "alignItems", "align-items", "", "unsafe flex-start");
     var alignItemsSafeFlexEnd = document.getElementById("alignItemsSafeFlexEnd");
@@ -182,9 +154,6 @@
     element.style.alignItems = "safe flex-end";
     checkValues(element, "alignItems", "align-items",  "safe flex-end", "safe flex-end");
 
-    element.style.alignItems = "right";
-    checkValues(element, "alignItems", "align-items",  "right", "right");
-
     element.style.alignItems = "center";
     checkValues(element, "alignItems", "align-items",  "center", "center");
 
@@ -216,10 +185,14 @@
     document.body.appendChild(element);
 
     checkBadValues(element, "alignItems", "align-items",  "auto");
+    checkBadValues(element, "alignItems", "align-items",  "left");
+    checkBadValues(element, "alignItems", "align-items",  "right");
     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",  "normal unsafe");
+    checkBadValues(element, "alignItems", "align-items",  "safe left");
+    checkBadValues(element, "alignItems", "align-items",  "unsafe right");
+    checkBadValues(element, "alignItems", "align-items",  "unsafe normal");
     checkBadValues(element, "alignItems", "align-items",  "normal stretch");
     checkBadValues(element, "alignItems", "align-items",  "baseline normal");
     checkBadValues(element, "alignItems", "align-items",  "baseline safe");
@@ -258,17 +231,17 @@
 
 test(function() {
     element.style.display = "grid";
-    checkInitialValues(element, "alignItems", "align-items", "safe left", "normal");
+    checkInitialValues(element, "alignItems", "align-items", "safe start", "normal");
 }, "Test the value 'initial' for grid containers");
 
 test(function() {
     element.style.display = "flex";
-    checkInitialValues(element, "alignItems", "align-items", "unsafe right", "normal");
+    checkInitialValues(element, "alignItems", "align-items", "unsafe end", "normal");
 }, "Test the value 'initial' for flex containers");
 
 test(function() {
     checkInheritValues("alignItems", "align-items", "end");
-    checkInheritValues("alignItems", "align-items", "safe left");
+    checkInheritValues("alignItems", "align-items", "safe start");
     checkInheritValues("alignItems", "align-items", "unsafe center");
 }, "Test the value 'inherit'");
 </script>
@@ -11,6 +11,6 @@ PASS Test the value 'initial' for grid containers
 PASS Test the value 'initial' for flex containers 
 PASS Test the value 'initial' for positioned elements 
 PASS Test the value 'initial' for positioned elements in grid containers 
-PASS Test the value 'initial' for positioned elements in grid containers 
+PASS Test the value 'initial' for positioned elements in flex containers 
 PASS Test the value 'inherit'