Reland of [css-align] Don't resolve 'auto' values for computed style.

third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html

Index: third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html
diff --git a/third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html b/third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html
index a8e6c0e92d34f93b3a0cc166332cdc4088fa704a..4967bdcd5ff0ce079244f44f2686178d47d251b7 100644
--- a/third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html
+++ b/third_party/WebKit/LayoutTests/fast/alignment/parse-place-self.html
@@ -58,6 +58,9 @@
 #placeSelfStartSafe {
   place-self: start safe;
 }
+#placeSelfBaselineSafe {
+  place-self: baseline safe;
+}
 #placeSelfStartEndLeft {
   place-self: start end left;
 }
@@ -113,7 +116,7 @@ function checkPlaceSelfValuesBadJS(value)
 {
   element.style.placeSelf = "";
   element.style.placeSelf = value;
-  checkPlaceSelfValues(element, "", "normal", "normal")
+  checkPlaceSelfValues(element, "", "auto", "auto")
 }
 
 test(function() {
@@ -122,8 +125,8 @@ test(function() {
 }, "Test getting the Computed Value of place-self's longhand properties when setting 'normal' value through CSS.");
 
 test(function() {
-  checkValues(placeSelfCenterAuto, "placeSelf", "place-self", "", "center normal");
-  checkPlaceSelfValues(placeSelfCenterAuto, "", "center", "normal");
+  checkValues(placeSelfCenterAuto, "placeSelf", "place-self", "", "center auto");
+  checkPlaceSelfValues(placeSelfCenterAuto, "", "center", "auto");
 }, "Test getting the Computed Value of place-self's longhand properties when setting 'center auto' value through CSS.");
 
 test(function() {
@@ -182,38 +185,38 @@ test(function() {
 }, "Test getting the Computed Value of place-self's longhand properties when setting 'start baseline' value through CSS.");
 
 test(function() {
-  checkValues(placeSelfAuto, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfAuto, "", "normal", "normal");
+  checkValues(placeSelfEmpty, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfEmpty, "", "auto", "auto");
 }, "Test setting '' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfAuto, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfAuto, "", "normal", "normal");
+  checkValues(placeSelfAuto, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfAuto, "", "auto", "auto");
 }, "Test setting 'auto' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfNone, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfNone, "", "normal", "normal");
+  checkValues(placeSelfNone, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfNone, "", "auto", "auto");
 }, "Test setting 'none' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfSafe, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfSafe, "", "normal", "normal");
+  checkValues(placeSelfSafe, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfSafe, "", "auto", "auto");
 }, "Test setting 'safe' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfStartSafe, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfStartSafe, "", "normal", "normal");
+  checkValues(placeSelfStartSafe, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfStartSafe, "", "auto", "auto");
 }, "Test setting 'start safe' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfStartSafe, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfStartSafe, "", "normal", "normal");
+  checkValues(placeSelfBaselineSafe, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfBaselineSafe, "", "auto", "auto");
 }, "Test setting 'baseline safe' as incorrect value through CSS.");
 
 test(function() {
-  checkValues(placeSelfStartEndLeft, "placeSelf", "place-self", "", "normal normal");
-  checkPlaceSelfValues(placeSelfStartEndLeft, "", "normal", "normal");
+  checkValues(placeSelfStartEndLeft, "placeSelf", "place-self", "", "auto auto");
+  checkPlaceSelfValues(placeSelfStartEndLeft, "", "auto", "auto");
 }, "Test setting 'start end left' as incorrect value through CSS.");
 
 test(function() {
@@ -221,35 +224,36 @@ test(function() {
   checkPlaceSelfValuesJS("center start", "center", "start");
   checkPlaceSelfValuesJS("self-start end", "self-start", "end");
   checkPlaceSelfValuesJS("normal end", "normal", "end");
+  checkPlaceSelfValuesJS("auto right", "auto", "right");
 }, "Test setting values through JS.");
 
 test(function() {
-  checkPlaceSelfValuesBadJS("space-between", "normal", "normal");
-  checkPlaceSelfValuesBadJS("center safe", "normal", "normal");
-  checkPlaceSelfValuesBadJS("center self-start center", "normal", "normal");
-  checkPlaceSelfValuesBadJS("asrt", "normal", "normal");
-  checkPlaceSelfValuesBadJS("10px", "normal", "normal");
-  checkPlaceSelfValuesBadJS("stretch safe", "normal", "normal");
-  checkPlaceSelfValuesBadJS("self-start start end", "normal", "normal");
-  checkPlaceSelfValuesBadJS("", "normal", "normal");
+  checkPlaceSelfValuesBadJS("space-between");
+  checkPlaceSelfValuesBadJS("center safe");
+  checkPlaceSelfValuesBadJS("center self-start center");
+  checkPlaceSelfValuesBadJS("asrt");
+  checkPlaceSelfValuesBadJS("10px");
+  checkPlaceSelfValuesBadJS("stretch safe");
+  checkPlaceSelfValuesBadJS("self-start start end");
+  checkPlaceSelfValuesBadJS("");
 }, "Test setting incorrect values through JS.");
 
 test(function() {
   element = document.createElement("div");
   document.body.appendChild(element);
-  checkValues(element, "placeSelf", "place-self", "", "normal normal");
+  checkValues(element, "placeSelf", "place-self", "", "auto auto");
   element.style.placeSelf = "center";
   checkPlaceSelfValues(element, "center", "center", "center");
   element.style.placeSelf = "initial";
-  checkValues(element, "placeSelf", "place-self", "initial", "normal normal");
-  checkPlaceSelfValues(element, "initial", "normal", "normal");
+  checkValues(element, "placeSelf", "place-self", "initial", "auto auto");
+  checkPlaceSelfValues(element, "initial", "auto", "auto");
 }, "Test the 'initial' value of the place-self shorthand and its longhand properties' Computed value");
 
 test(function() {
   document.body.style.placeSelf = "start";
   var anotherElement = document.createElement("div");
   document.body.appendChild(anotherElement);
-  checkPlaceSelfValues(anotherElement, "", "normal", "normal");
+  checkPlaceSelfValues(anotherElement, "", "auto", "auto");
   anotherElement.style.placeSelf = "inherit";
   checkPlaceSelfValues(anotherElement, "inherit", "start", "start");
 }, "Test the 'inherit' value of the place-self shorthand and its longhand properties' Computed value");