Index: third_party/WebKit/LayoutTests/fast/alignment/parse-align-self.html |
diff --git a/third_party/WebKit/LayoutTests/fast/alignment/parse-align-self.html b/third_party/WebKit/LayoutTests/fast/alignment/parse-align-self.html |
index 8e81f78133de65d891125fb734a9294b078a2a64..149c1a0c3ad500ae2f7a67ddf0720ec46561cfb2 100644 |
--- a/third_party/WebKit/LayoutTests/fast/alignment/parse-align-self.html |
+++ b/third_party/WebKit/LayoutTests/fast/alignment/parse-align-self.html |
@@ -14,10 +14,6 @@ |
#alignSelfStretch { |
align-self: stretch; |
-} |
- |
-#alignSelfNormal { |
- align-self: normal; |
} |
#alignSelfStart { |
@@ -93,7 +89,6 @@ |
<div id="alignSelfFirstBaseline"></div> |
<div id="alignSelfLastBaseline"></div> |
<div id="alignSelfStretch"></div> |
-<div id="alignSelfNormal"></div> |
<div id="alignSelfStart"></div> |
<div id="alignSelfEnd"></div> |
<div id="alignSelfCenter"></div> |
@@ -125,8 +120,6 @@ |
checkValues(alignSelfLastBaseline, "alignSelf", "align-self", "", "last baseline"); |
var alignSelfStretch = document.getElementById("alignSelfStretch"); |
checkValues(alignSelfStretch, "alignSelf", "align-self", "", "stretch"); |
- var alignSelfNormal = document.getElementById("alignSelfNormal"); |
- checkValues(alignSelfNormal, "alignSelf", "align-self", "", "normal"); |
var alignSelfStart = document.getElementById("alignSelfStart"); |
checkValues(alignSelfStart, "alignSelf", "align-self", "", "start"); |
var alignSelfEnd = document.getElementById("alignSelfEnd"); |
@@ -167,7 +160,7 @@ |
test(function() { |
element = document.createElement("div"); |
document.body.appendChild(element); |
- checkValues(element, "alignSelf", "align-self", "", "auto"); |
+ checkValues(element, "alignSelf", "align-self", "", "normal"); |
}, "Test initial value of align-self through JS"); |
test(function() { |
@@ -193,19 +186,16 @@ |
element.style.alignSelf = "self-start"; |
checkValues(element, "alignSelf", "align-self", "self-start", "self-start"); |
- element.style.alignSelf = "normal"; |
- checkValues(element, "alignSelf", "align-self", "normal", "normal"); |
- |
element.style.alignSelf = "auto"; |
- checkValues(element, "alignSelf", "align-self", "auto", "auto"); |
+ checkValues(element, "alignSelf", "align-self", "auto", "normal"); |
container.style.display = "flex"; |
element.style.alignSelf = "auto"; |
- checkValues(element, "alignSelf", "align-self", "auto", "auto"); |
+ checkValues(element, "alignSelf", "align-self", "auto", "normal"); |
container.style.display = "grid"; |
element.style.alignSelf = "auto"; |
- checkValues(element, "alignSelf", "align-self", "auto", "auto"); |
+ checkValues(element, "alignSelf", "align-self", "auto", "normal"); |
element.style.alignSelf = "self-end"; |
checkValues(element, "alignSelf", "align-self", "self-end", "self-end"); |
@@ -213,7 +203,7 @@ |
test(function() { |
document.documentElement.style.alignSelf = "auto"; |
- checkValues(document.documentElement, "alignSelf", "align-self", "auto", "auto"); |
+ checkValues(document.documentElement, "alignSelf", "align-self", "auto", "normal"); |
}, "Test 'auto' value resolution for the root node"); |
test(function() { |
@@ -224,9 +214,6 @@ |
checkBadValues(element, "alignSelf", "align-self", "auto safe"); |
checkBadValues(element, "alignSelf", "align-self", "auto left"); |
- checkBadValues(element, "alignSelf", "align-self", "normal unsafe"); |
- checkBadValues(element, "alignSelf", "align-self", "normal stretch"); |
- checkBadValues(element, "alignSelf", "align-self", "baseline normal"); |
checkBadValues(element, "alignSelf", "align-self", "baseline safe"); |
checkBadValues(element, "alignSelf", "align-self", "baseline center"); |
checkBadValues(element, "alignSelf", "align-self", "stretch unsafe"); |
@@ -252,35 +239,35 @@ |
test(function() { |
container.style.display = ""; |
- checkInitialValues(element, "alignSelf", "align-self", "center", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "center", "normal"); |
}, "Test the value 'initial'"); |
test(function() { |
container.style.display = "grid"; |
- checkInitialValues(element, "alignSelf", "align-self", "left safe", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "left safe", "normal"); |
}, "Test the value 'initial' for grid containers"); |
test(function() { |
container.style.display = "flex"; |
- checkInitialValues(element, "alignSelf", "align-self", "right unsafe", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "right unsafe", "normal"); |
}, "Test the value 'initial' for flex containers"); |
test(function() { |
container.style.display = ""; |
element.style.position = "absolute"; |
- checkInitialValues(element, "alignSelf", "align-self", "left", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "left", "normal"); |
}, "Test the value 'initial' for positioned elements"); |
test(function() { |
container.style.display = "grid"; |
element.style.position = "absolute"; |
- checkInitialValues(element, "alignSelf", "align-self", "right", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "right", "normal"); |
}, "Test the value 'initial' for positioned elements in grid containers"); |
test(function() { |
container.style.display = "flex"; |
element.style.position = "absolute"; |
- checkInitialValues(element, "alignSelf", "align-self", "end", "auto"); |
+ checkInitialValues(element, "alignSelf", "align-self", "end", "normal"); |
}, "Test the value 'initial' for positioned elements in grid containers"); |
test(function() { |