Make scroll-timeline-{name|axis} be a coordinating list property group.
Named scroll progress timelines are declared in the coordinated value list
constructed from the longhands of the scroll-timeline shorthand property,
which form a coordinating list property group with scroll-timeline-name as
the coordinating list base property.
In the meantime, we also update its shorthand to match the current spec.
Differential Revision: https://phabricator.services.mozilla.com/D166596
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1809005
gecko-commit: 9d8a752ffbef0631c5bd72b30ac9a1d523e3544b
gecko-reviewers: emilio
diff --git a/scroll-animations/css/scroll-timeline-axis-computed.tentative.html b/scroll-animations/css/scroll-timeline-axis-computed.html
similarity index 81%
rename from scroll-animations/css/scroll-timeline-axis-computed.tentative.html
rename to scroll-animations/css/scroll-timeline-axis-computed.html
index 8e23968..b971aba 100644
--- a/scroll-animations/css/scroll-timeline-axis-computed.tentative.html
+++ b/scroll-animations/css/scroll-timeline-axis-computed.html
@@ -1,10 +1,8 @@
<!DOCTYPE html>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/6674">
-<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/rewrite#scroll-timeline-axis">
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-axis">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/computed-testcommon.js"></script>
-</head>
<style>
#outer { scroll-timeline-axis: inline; }
#target { scroll-timeline-axis: vertical; }
@@ -21,6 +19,10 @@
test_computed_value('scroll-timeline-axis', 'inline');
test_computed_value('scroll-timeline-axis', 'vertical');
test_computed_value('scroll-timeline-axis', 'horizontal');
+test_computed_value('scroll-timeline-axis', 'block, inline');
+test_computed_value('scroll-timeline-axis', 'inline, block');
+test_computed_value('scroll-timeline-axis', 'block, vertical, horizontal, inline');
+test_computed_value('scroll-timeline-axis', 'inline, inline, inline, inline');
test(() => {
let style = getComputedStyle(document.getElementById('target'));
diff --git a/scroll-animations/css/scroll-timeline-axis-parsing.tentative.html b/scroll-animations/css/scroll-timeline-axis-parsing.html
similarity index 68%
rename from scroll-animations/css/scroll-timeline-axis-parsing.tentative.html
rename to scroll-animations/css/scroll-timeline-axis-parsing.html
index 81be07e..25f48f0 100644
--- a/scroll-animations/css/scroll-timeline-axis-parsing.tentative.html
+++ b/scroll-animations/css/scroll-timeline-axis-parsing.html
@@ -1,10 +1,8 @@
<!DOCTYPE html>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/6674">
-<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/rewrite#scroll-timeline-axis">
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-axis">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/parsing-testcommon.js"></script>
-</head>
<div id="target"></div>
<script>
@@ -18,10 +16,16 @@
test_valid_value('scroll-timeline-axis', 'inline');
test_valid_value('scroll-timeline-axis', 'vertical');
test_valid_value('scroll-timeline-axis', 'horizontal');
+test_valid_value('scroll-timeline-axis', 'block, inline');
+test_valid_value('scroll-timeline-axis', 'inline, block');
+test_valid_value('scroll-timeline-axis', 'block, vertical, horizontal, inline');
+test_valid_value('scroll-timeline-axis', 'inline, inline, inline, inline');
test_invalid_value('scroll-timeline-axis', 'abc');
test_invalid_value('scroll-timeline-axis', '10px');
test_invalid_value('scroll-timeline-axis', 'auto');
test_invalid_value('scroll-timeline-axis', 'none');
+test_invalid_value('scroll-timeline-axis', 'block inline');
+test_invalid_value('scroll-timeline-axis', 'block / inline');
</script>
diff --git a/scroll-animations/css/scroll-timeline-name-computed.tentative.html b/scroll-animations/css/scroll-timeline-name-computed.html
similarity index 78%
rename from scroll-animations/css/scroll-timeline-name-computed.tentative.html
rename to scroll-animations/css/scroll-timeline-name-computed.html
index 1acb964..bfffafc 100644
--- a/scroll-animations/css/scroll-timeline-name-computed.tentative.html
+++ b/scroll-animations/css/scroll-timeline-name-computed.html
@@ -1,6 +1,5 @@
<!DOCTYPE html>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/6674">
-<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/rewrite#scroll-timeline-name">
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-name">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/computed-testcommon.js"></script>
@@ -19,7 +18,11 @@
test_computed_value('scroll-timeline-name', 'revert', 'none');
test_computed_value('scroll-timeline-name', 'none');
test_computed_value('scroll-timeline-name', 'test');
-test_computed_value('scroll-timeline-name', 'tEst');
+test_computed_value('scroll-timeline-name', 'foo, bar');
+test_computed_value('scroll-timeline-name', 'bar, foo');
+test_computed_value('scroll-timeline-name', 'a, b, c, D, e');
+test_computed_value('scroll-timeline-name', 'none, none');
+test_computed_value('scroll-timeline-name', 'a, b, c, none, d, e');
test(() => {
let style = getComputedStyle(document.getElementById('target'));
diff --git a/scroll-animations/css/scroll-timeline-name-parsing.tentative.html b/scroll-animations/css/scroll-timeline-name-parsing.html
similarity index 81%
rename from scroll-animations/css/scroll-timeline-name-parsing.tentative.html
rename to scroll-animations/css/scroll-timeline-name-parsing.html
index a8f2e31..0fb2712 100644
--- a/scroll-animations/css/scroll-timeline-name-parsing.tentative.html
+++ b/scroll-animations/css/scroll-timeline-name-parsing.html
@@ -1,12 +1,9 @@
<!DOCTYPE html>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/6674">
-<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/rewrite#scroll-timeline-name">
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-name">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/parsing-testcommon.js"></script>
-</head>
<div id="target"></div>
-
<script>
test_valid_value('scroll-timeline-name', 'initial');
@@ -18,6 +15,10 @@
test_valid_value('scroll-timeline-name', 'abc');
test_valid_value('scroll-timeline-name', ' abc', 'abc');
test_valid_value('scroll-timeline-name', 'aBc');
+test_valid_value('scroll-timeline-name', 'foo, bar');
+test_valid_value('scroll-timeline-name', 'bar, foo');
+test_valid_value('scroll-timeline-name', 'none, none');
+test_valid_value('scroll-timeline-name', 'a, none, b');
test_valid_value('scroll-timeline-name', 'auto');
test_invalid_value('scroll-timeline-name', 'default');
