Backed out 9 changesets (bug 1791780, bug 1791782, bug 1791778, bug 1791777) for causing multiple mochitest failures CLOSED TREE
Backed out changeset 6de1ade5a9b6 (bug 1791782)
Backed out changeset ce96452a38a1 (bug 1791782)
Backed out changeset 7cc8e027f5a7 (bug 1791780)
Backed out changeset 8e023280032c (bug 1791778)
Backed out changeset 26d65d76d02a (bug 1791778)
Backed out changeset a98dd552df64 (bug 1791777)
Backed out changeset 766386309ee5 (bug 1791777)
Backed out changeset 7de66a218ba4 (bug 1791777)
Backed out changeset 1d17c257444e (bug 1791777)
gecko-commit: 95e88e50554a28094551439c92302ff79ec254a5
diff --git a/css/css-fonts/font-palette-vs-shorthand.html b/css/css-fonts/font-palette-vs-shorthand.html
deleted file mode 100644
index 6c5cc97..0000000
--- a/css/css-fonts/font-palette-vs-shorthand.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Fonts Module Level 4: interaction of font-palette and font shorthand</title>
-<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-prop">
-<meta name="assert" content="font-palette is reset to normal by font shorthand.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style id="style">
-@font-face {
- font-family: colr;
- src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
-}
-div {
- margin: 10px;
-}
-#a {
- font: 50px colr;
- font-palette: dark;
-}
-#b {
- font-palette: dark;
- font: 50px colr; /* should reset font-palette to normal */
-}
-#c {
- font-palette: dark;
- font-size: 50px;
- font-family: colr;
-}
-#d {
- font-palette: dark;
- font-size: 50px;
- font-family: colr;
- font-palette: normal;
-}
-</style>
-</head>
-<body>
-<p>The first and third examples should use the 'dark' palette; the second and fourth, 'normal'.</p>
-<div id=a>A</div>
-<div id=b>A</div>
-<div id=c>A</div>
-<div id=d>A</div>
-<script>
-test(function() {
- let testElem = document.getElementById("a");
- let computed = window.getComputedStyle(testElem);
- assert_equals(computed.fontPalette, "dark");
- assert_equals(computed.font, "");
- assert_equals(computed.fontFamily, "colr");
- assert_equals(computed.fontSize, "50px");
-});
-
-test(function() {
- let testElem = document.getElementById("b");
- let computed = window.getComputedStyle(testElem);
- assert_equals(computed.fontPalette, "normal");
- assert_not_equals(computed.font, "");
- /* The exact form of the font shorthand varies, but should include these pieces: */
- assert_not_equals(computed.font.indexOf("50px"), -1);
- assert_not_equals(computed.font.indexOf("colr"), -1);
- /* And there should be no trace of this: */
- assert_equals(computed.font.indexOf("dark"), -1);
-});
-
-test(function() {
- let testElem = document.getElementById("c");
- let computed = window.getComputedStyle(testElem);
- assert_equals(computed.fontPalette, "dark");
- assert_equals(computed.font, "");
-});
-
-test(function() {
- let testElem = document.getElementById("d");
- let computed = window.getComputedStyle(testElem);
- assert_equals(computed.fontPalette, "normal");
- assert_not_equals(computed.font.indexOf("50px"), -1);
- assert_not_equals(computed.font.indexOf("colr"), -1);
-});
-</script>
-</body>
-</html>
diff --git a/css/css-fonts/parsing/font-palette-values-invalid.html b/css/css-fonts/parsing/font-palette-values-invalid.html
index 2056055..d439f64 100644
--- a/css/css-fonts/parsing/font-palette-values-invalid.html
+++ b/css/css-fonts/parsing/font-palette-values-invalid.html
@@ -19,7 +19,7 @@
/* 0 */
@font-palette-values --A {
- font-family: a, serif; /* multiple families are allowed, but not generics */
+ font-family: a, b;
}
/* 1 */
diff --git a/css/css-fonts/parsing/font-palette-values-valid.html b/css/css-fonts/parsing/font-palette-values-valid.html
index 3c0c062..e6e3dda 100644
--- a/css/css-fonts/parsing/font-palette-values-valid.html
+++ b/css/css-fonts/parsing/font-palette-values-valid.html
@@ -98,11 +98,6 @@
/* 15 */
@font-palette-values -- {
}
-
-/* 16 */
-@font-palette-values --P {
- font-family: foo, bar, baz;
-}
</style>
</head>
<body>
@@ -209,7 +204,7 @@
test(function() {
let rule = rules[5];
assert_equals(rule.name, "--F");
- assert_in_array(rule.fontFamily, ["foo", "\"foo\""]);
+ assert_equals(rule.fontFamily, "foo");
assert_equals(rule.basePalette, "");
assert_equals(rule.overrideColors, "");
});
@@ -377,14 +372,6 @@
assert_equals(rule.basePalette, "");
assert_equals(rule.overrideColors, "");
});
-
-test(function() {
- let rule = rules[16];
- assert_equals(rule.name, "--P");
- assert_equals(rule.fontFamily, "foo, bar, baz");
- assert_equals(rule.basePalette, "");
- assert_equals(rule.overrideColors, "");
-});
</script>
</body>
</html>
