Skip to content

Commit 041fc9c

Browse files
author
[email protected]
committed
Font palette names have to start with two hyphens
https://bugs.webkit.org/show_bug.cgi?id=230790 <rdar://problem/83530013> Reviewed by Dean Jackson. LayoutTests/imported/w3c: Tests are being upstreamed at web-platform-tests/wpt#30963. * web-platform-tests/css/css-fonts/font-palette-add-2-expected.html: * web-platform-tests/css/css-fonts/font-palette-add-2.html: * web-platform-tests/css/css-fonts/font-palette-add-expected-mismatch.html: * web-platform-tests/css/css-fonts/font-palette-add.html: * web-platform-tests/css/css-fonts/font-palette-empty-font-family-expected-mismatch.html: * web-platform-tests/css/css-fonts/font-palette-empty-font-family.html: * web-platform-tests/css/css-fonts/font-palette-modify-2-expected.html: * web-platform-tests/css/css-fonts/font-palette-modify-2.html: * web-platform-tests/css/css-fonts/font-palette-modify-expected-mismatch.html: * web-platform-tests/css/css-fonts/font-palette-modify.html: * web-platform-tests/css/css-fonts/font-palette-remove-2-expected.html: * web-platform-tests/css/css-fonts/font-palette-remove-2.html: * web-platform-tests/css/css-fonts/font-palette-remove-expected-mismatch.html: * web-platform-tests/css/css-fonts/font-palette-remove.html: * web-platform-tests/css/css-fonts/font-palette.html: * web-platform-tests/css/css-fonts/palette-values-rule-add-2-expected.html: * web-platform-tests/css/css-fonts/palette-values-rule-add-2.html: * web-platform-tests/css/css-fonts/palette-values-rule-add-expected-mismatch.html: * web-platform-tests/css/css-fonts/palette-values-rule-add.html: * web-platform-tests/css/css-fonts/palette-values-rule-delete-2-expected.html: * web-platform-tests/css/css-fonts/palette-values-rule-delete-2.html: * web-platform-tests/css/css-fonts/palette-values-rule-delete-expected-mismatch.html: * web-platform-tests/css/css-fonts/palette-values-rule-delete.html: * web-platform-tests/css/css-fonts/parsing/font-palette-computed-expected.txt: * web-platform-tests/css/css-fonts/parsing/font-palette-computed.html: * web-platform-tests/css/css-fonts/parsing/font-palette-invalid-expected.txt: * web-platform-tests/css/css-fonts/parsing/font-palette-invalid.html: * web-platform-tests/css/css-fonts/parsing/font-palette-valid-expected.txt: * web-platform-tests/css/css-fonts/parsing/font-palette-valid.html: * web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html: * web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html: Source/WebCore: The spec changed in w3c/csswg-drafts@9ddf938. Font palettes now have to be named with a <dashed-ident>. Updated existing tests. * css/parser/CSSParserImpl.cpp: (WebCore::CSSParserImpl::consumeFontPaletteValuesRule): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeFontPalette): * css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeDashedCustomIdent): * css/parser/CSSPropertyParserHelpers.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@283221 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f0ef7ec commit 041fc9c

File tree

43 files changed

+207
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+207
-128
lines changed

‎LayoutTests/imported/w3c/ChangeLog

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
2021-09-29 Myles C. Maxfield <[email protected]>
2+
3+
Font palette names have to start with two hyphens
4+
https://bugs.webkit.org/show_bug.cgi?id=230790
5+
<rdar://problem/83530013>
6+
7+
Reviewed by Dean Jackson.
8+
9+
Tests are being upstreamed at https://github.com/web-platform-tests/wpt/pull/30963.
10+
11+
* web-platform-tests/css/css-fonts/font-palette-add-2-expected.html:
12+
* web-platform-tests/css/css-fonts/font-palette-add-2.html:
13+
* web-platform-tests/css/css-fonts/font-palette-add-expected-mismatch.html:
14+
* web-platform-tests/css/css-fonts/font-palette-add.html:
15+
* web-platform-tests/css/css-fonts/font-palette-empty-font-family-expected-mismatch.html:
16+
* web-platform-tests/css/css-fonts/font-palette-empty-font-family.html:
17+
* web-platform-tests/css/css-fonts/font-palette-modify-2-expected.html:
18+
* web-platform-tests/css/css-fonts/font-palette-modify-2.html:
19+
* web-platform-tests/css/css-fonts/font-palette-modify-expected-mismatch.html:
20+
* web-platform-tests/css/css-fonts/font-palette-modify.html:
21+
* web-platform-tests/css/css-fonts/font-palette-remove-2-expected.html:
22+
* web-platform-tests/css/css-fonts/font-palette-remove-2.html:
23+
* web-platform-tests/css/css-fonts/font-palette-remove-expected-mismatch.html:
24+
* web-platform-tests/css/css-fonts/font-palette-remove.html:
25+
* web-platform-tests/css/css-fonts/font-palette.html:
26+
* web-platform-tests/css/css-fonts/palette-values-rule-add-2-expected.html:
27+
* web-platform-tests/css/css-fonts/palette-values-rule-add-2.html:
28+
* web-platform-tests/css/css-fonts/palette-values-rule-add-expected-mismatch.html:
29+
* web-platform-tests/css/css-fonts/palette-values-rule-add.html:
30+
* web-platform-tests/css/css-fonts/palette-values-rule-delete-2-expected.html:
31+
* web-platform-tests/css/css-fonts/palette-values-rule-delete-2.html:
32+
* web-platform-tests/css/css-fonts/palette-values-rule-delete-expected-mismatch.html:
33+
* web-platform-tests/css/css-fonts/palette-values-rule-delete.html:
34+
* web-platform-tests/css/css-fonts/parsing/font-palette-computed-expected.txt:
35+
* web-platform-tests/css/css-fonts/parsing/font-palette-computed.html:
36+
* web-platform-tests/css/css-fonts/parsing/font-palette-invalid-expected.txt:
37+
* web-platform-tests/css/css-fonts/parsing/font-palette-invalid.html:
38+
* web-platform-tests/css/css-fonts/parsing/font-palette-valid-expected.txt:
39+
* web-platform-tests/css/css-fonts/parsing/font-palette-valid.html:
40+
* web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html:
41+
* web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html:
42+
143
2021-09-29 Myles C. Maxfield <[email protected]>
244

345
CSSFontPaletteValuesRule should not be maplike

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation-2-expected.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1212
}
1313

14-
@font-palette-values Palette0 {
14+
@font-palette-values --Palette0 {
1515
font-family: "Ahem-COLR";
1616
base-palette: 0;
1717
}
1818

19-
@font-palette-values Palette1 {
19+
@font-palette-values --Palette1 {
2020
font-family: "Ahem-COLR";
2121
base-palette: 1;
2222
}
2323

2424
#target {
25-
font-palette: Palette1;
25+
font-palette: --Palette1;
2626
}
2727
</style>
2828
</head>

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation-2.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1313
}
1414

15-
@font-palette-values Palette0 {
15+
@font-palette-values --Palette0 {
1616
font-family: "Ahem-COLR";
1717
base-palette: 0;
1818
}
1919

20-
@font-palette-values Palette1 {
20+
@font-palette-values --Palette1 {
2121
font-family: "Ahem-COLR";
2222
base-palette: 1;
2323
}
2424

2525
@keyframes TheAnimation {
2626
from {
27-
font-palette: Palette0;
27+
font-palette: --Palette0;
2828
}
2929
to {
30-
font-palette: Palette1;
30+
font-palette: --Palette1;
3131
}
3232
}
3333

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation-3-expected-mismatch.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1212
}
1313

14-
@font-palette-values Palette0 {
14+
@font-palette-values --Palette0 {
1515
font-family: "Ahem-COLR";
1616
base-palette: 0;
1717
}
1818

19-
@font-palette-values Palette1 {
19+
@font-palette-values --Palette1 {
2020
font-family: "Ahem-COLR";
2121
base-palette: 1;
2222
}
2323

2424
@keyframes TheAnimation {
2525
from {
26-
font-palette: Palette0;
26+
font-palette: --Palette0;
2727
}
2828
to {
29-
font-palette: Palette1;
29+
font-palette: --Palette1;
3030
}
3131
}
3232

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation-3.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1313
}
1414

15-
@font-palette-values Palette0 {
15+
@font-palette-values --Palette0 {
1616
font-family: "Ahem-COLR";
1717
base-palette: 0;
1818
}
1919

20-
@font-palette-values Palette1 {
20+
@font-palette-values --Palette1 {
2121
font-family: "Ahem-COLR";
2222
base-palette: 1;
2323
}
2424

2525
@keyframes TheAnimation {
2626
from {
27-
font-palette: Palette0;
27+
font-palette: --Palette0;
2828
}
2929
to {
30-
font-palette: Palette1;
30+
font-palette: --Palette1;
3131
}
3232
}
3333

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation-expected.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1212
}
1313

14-
@font-palette-values Palette0 {
14+
@font-palette-values --Palette0 {
1515
font-family: "Ahem-COLR";
1616
base-palette: 0;
1717
}
1818

19-
@font-palette-values Palette1 {
19+
@font-palette-values --Palette1 {
2020
font-family: "Ahem-COLR";
2121
base-palette: 1;
2222
}
2323

2424
#target {
25-
font-palette: Palette0;
25+
font-palette: --Palette0;
2626
}
2727
</style>
2828
</head>

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/animations/font-palette-animation.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
src: url("../resources/Ahem-COLR-palettes.ttf") format("truetype");
1313
}
1414

15-
@font-palette-values Palette0 {
15+
@font-palette-values --Palette0 {
1616
font-family: "Ahem-COLR";
1717
base-palette: 0;
1818
}
1919

20-
@font-palette-values Palette1 {
20+
@font-palette-values --Palette1 {
2121
font-family: "Ahem-COLR";
2222
base-palette: 1;
2323
}
2424

2525
@keyframes TheAnimation {
2626
from {
27-
font-palette: Palette0;
27+
font-palette: --Palette0;
2828
}
2929
to {
30-
font-palette: Palette1;
30+
font-palette: --Palette1;
3131
}
3232
}
3333

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-add-2-expected.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
src: url("resources/Ahem-COLR-palettes.ttf") format("truetype");
1212
}
1313

14-
@font-palette-values MyPalette {
14+
@font-palette-values --MyPalette {
1515
font-family: "Ahem-COLR";
1616
base-palette: 1;
1717
}
1818
</style>
1919
</head>
2020
<body>
21-
<div id="target" style="font: 48px 'Ahem-COLR'; font-palette: MyPalette;">A</div>
21+
<div id="target" style="font: 48px 'Ahem-COLR'; font-palette: --MyPalette;">A</div>
2222
</body>
2323
</html>

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-add-2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
src: url("resources/Ahem-COLR-palettes.ttf") format("truetype");
1313
}
1414

15-
@font-palette-values MyPalette {
15+
@font-palette-values --MyPalette {
1616
font-family: "Ahem-COLR";
1717
base-palette: 1;
1818
}
@@ -24,7 +24,7 @@
2424
let count = 0;
2525
function tick() {
2626
if (count > 3) {
27-
document.getElementById("target").style.setProperty("font-palette", "MyPalette");
27+
document.getElementById("target").style.setProperty("font-palette", "--MyPalette");
2828
document.documentElement.classList.remove("reftest-wait");
2929
} else {
3030
++count;

‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-add-expected-mismatch.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
src: url("resources/Ahem-COLR-palettes.ttf") format("truetype");
1212
}
1313

14-
@font-palette-values MyPalette {
14+
@font-palette-values --MyPalette {
1515
font-family: "Ahem-COLR";
1616
base-palette: 1;
1717
}

0 commit comments

Comments
 (0)