Applied additional changes before landing.
diff --git a/css-align-3/content-distribution/place-content-shorthand-001.html b/css-align-3/content-distribution/place-content-shorthand-001.html
index 49d2c08..92c78b2 100644
--- a/css-align-3/content-distribution/place-content-shorthand-001.html
+++ b/css-align-3/content-distribution/place-content-shorthand-001.html
@@ -5,10 +5,10 @@
<meta name="assert" content="Check that setting a single value to place-content expands to such value set in both 'align-content' and 'justify-content'." />
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/alignment-parsing-utils.js"></script>
+<script src="/css-align-3/resources/alignment-parsing-utils.js"></script>
<div id="log"></div>
<script>
- var values = ["normal"].concat(position, distribution, baseline);
+ var values = ["normal"].concat(contentPositionValues, distributionValues, baselineValues);
values.forEach(function(value) {
test(function() { checkPlaceContent(value, "") }, "Checking place-content: " + value);
});
diff --git a/css-align-3/content-distribution/place-content-shorthand-002.html b/css-align-3/content-distribution/place-content-shorthand-002.html
index fc5fdfb..6a79d04 100644
--- a/css-align-3/content-distribution/place-content-shorthand-002.html
+++ b/css-align-3/content-distribution/place-content-shorthand-002.html
@@ -8,8 +8,8 @@
<script src="../resources/alignment-parsing-utils.js"></script>
<div id="log"></div>
<script>
- var values1 = ["normal"].concat(position.slice(1,5), distribution.slice(1,3), baseline.slice(1,2));
- var values2 = position.slice(5).concat(distribution.slice(3), baseline.slice(2));
+ var values1 = ["normal"].concat(contentPositionValues, distributionValues, baselineValues);
+ var values2 = contentPositionValues.concat(distributionValues, baselineValues);
values1.forEach(function(alignValue) {
values2.forEach(function(justifyValue) {
test(function() { checkPlaceContent(alignValue, justifyValue) },
diff --git a/css-align-3/content-distribution/place-content-shorthand-003.html b/css-align-3/content-distribution/place-content-shorthand-003.html
index 6e3cae3..a791f5b 100644
--- a/css-align-3/content-distribution/place-content-shorthand-003.html
+++ b/css-align-3/content-distribution/place-content-shorthand-003.html
@@ -8,28 +8,28 @@
<style>
#test {
align-content: start;
- justify-content: end;
+ justify-content: end;
}
</style>
<div id="log"></div>
<div id="test"></div>
<script>
var div = document.getElementById("test");
- div.setAttribute("style", "place-content: initial")
- var cs = getComputedStyle(div, null);
+ div.setAttribute("style", "place-content: initial");
+ var style = getComputedStyle(div);
test(function() {
- assert_equals(cs.getPropertyValue("place-content"),
+ assert_equals(style.getPropertyValue("place-content"),
"normal normal", "place-content resolved value");
}, "Check place-content: initial - resolved value");
test(function() {
- assert_equals(cs.getPropertyValue("align-content"),
+ assert_equals(style.getPropertyValue("align-content"),
"normal", "place-content specified value for align-content");
}, "Check place-content: initial - align-content resolved value");
test(function() {
- assert_equals(cs.getPropertyValue("justify-content"),
+ assert_equals(style.getPropertyValue("justify-content"),
"normal", "place-content specified value for justify-content");
}, "Check place-content: initial - justify-content resolved value");
</script>
diff --git a/css-align-3/content-distribution/place-content-shorthand-004.html b/css-align-3/content-distribution/place-content-shorthand-004.html
index c5560ba..3a4a6e8 100644
--- a/css-align-3/content-distribution/place-content-shorthand-004.html
+++ b/css-align-3/content-distribution/place-content-shorthand-004.html
@@ -17,11 +17,11 @@
<script>
function checkInvalidValues(value) {
var div = document.getElementById("test");
- div.setAttribute("style", "place-content: " + value)
- var cs = getComputedStyle(div, null);
- assert_equals(cs.getPropertyValue("align-content"),
+ div.setAttribute("style", "place-content: " + value);
+ var style = getComputedStyle(div);
+ assert_equals(style.getPropertyValue("align-content"),
"start", "align-content computed value");
- assert_equals(cs.getPropertyValue("justify-content"),
+ assert_equals(style.getPropertyValue("justify-content"),
"end", "justify-content computed value");
}
diff --git a/css-align-3/content-distribution/place-content-shorthand-005.html b/css-align-3/content-distribution/place-content-shorthand-005.html
index be1a981..b8ac8d5 100644
--- a/css-align-3/content-distribution/place-content-shorthand-005.html
+++ b/css-align-3/content-distribution/place-content-shorthand-005.html
@@ -16,20 +16,20 @@
var child = document.createElement("div");
document.getElementById("test").appendChild(child);
child.setAttribute("style", "place-content: inherit");
- var cs = getComputedStyle(child, null);
+ var style = getComputedStyle(child);
test(function() {
- assert_equals(cs.getPropertyValue("place-content"),
+ assert_equals(style.getPropertyValue("place-content"),
"start end", "place-content computed value");
}, "Check place-content: inherit - resolved value");
test(function() {
- assert_equals(cs.getPropertyValue("align-content"),
+ assert_equals(style.getPropertyValue("align-content"),
"start", "place-content specified value for align-content");
}, "Check place-content: inherit - align-content resolved value");
test(function() {
- assert_equals(cs.getPropertyValue("justify-content"),
+ assert_equals(style.getPropertyValue("justify-content"),
"end", "place-content specified value for justify-content");
}, "Check place-content: inherit - justify-content resolved value");
</script>
diff --git a/css-align-3/resources/alignment-parsing-utils.js b/css-align-3/resources/alignment-parsing-utils.js
index ffd6cf2..ef87625 100644
--- a/css-align-3/resources/alignment-parsing-utils.js
+++ b/css-align-3/resources/alignment-parsing-utils.js
@@ -1,13 +1,13 @@
-var position = [ "start", "end", "self-start", "self-end", "left", "right", "center", "flex-start", "flex-end"];
-var distribution = [ "stretch", "space-around", "space-between", "space-evenly"];
-var baseline = [ "baseline", "last-baseline"];
+var contentPositionValues = [ "start", "end", "left", "right", "center", "flex-start", "flex-end"];
+var distributionValues = [ "stretch", "space-around", "space-between", "space-evenly"];
+var baselineValues = [ "baseline", "first baseline", "last baseline"];
-function checkPlaceContent(alignValue, justifyValue)
+function checkPlaceContent(alignValue, justifyValue = "")
{
var div = document.createElement("div");
- div.setAttribute("style", "place-content: " + alignValue + " " + justifyValue)
+ div.setAttribute("style", "place-content: " + alignValue + " " + justifyValue);
document.body.appendChild(div);
- if (justifyValue.length == 0)
+ if (justifyValue === "")
justifyValue = alignValue;
var style = getComputedStyle(div);
assert_equals(style.getPropertyValue("place-content"),
