Skip to content

Commit 79846be

Browse files
MaxIhlenfeldtlutien
MaxIhlenfeldt
authored and
lutien
committed
Bug 1966700 [wpt PR 52568] - Enable some WPT tests depending on CSSTest fonts,
Automatic update from web-platform-tests Enable some WPT tests depending on CSSTest fonts https://crrev.com/c/6512831 added the CSSTest fonts to test_fonts, so we can now enable some tests that depend on them on Linux (the only platform where test_fonts are loaded). Bug: 412384635 Change-Id: Iaf36e6dcf3249c9bbe3fc9bfda1135c44780a7ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476224 Reviewed-by: Dominik Röttsches <[email protected]> Commit-Queue: Dominik Röttsches <[email protected]> Auto-Submit: Max Ihlenfeldt <[email protected]> Cr-Commit-Position: refs/heads/main@{#1460718} -- wpt-commits: 542ce5d49d33df06e8e1ab929359568c469e983c wpt-pr: 52568 Differential Revision: https://phabricator.services.mozilla.com/D250629
1 parent 5e9ad2a commit 79846be

File tree

6 files changed

+60
-16
lines changed

6 files changed

+60
-16
lines changed

‎testing/web-platform/tests/css/css-fonts/font-family-name-000.xht

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
4-
<title>CSS Test: Test for prescense of test fonts</title>
4+
<title>CSS Test: Test for presence of test fonts</title>
55
<link rel="author" title="Mozilla" href="http://www.mozilla.com/" />
66
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family" />
77
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
88
<link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop"/>
9+
<link rel="match" href="font-family-name-ref.xht"/>
910
<meta name="assert" content="Test will fail if CSSTest fonts are not installed" />
1011
<style type="text/css">
11-
div#test1 {
12+
body { font-size: 36px; }
13+
span#verify { font-family: CSSTest Verify; }
14+
p#test1 {
1215
font-family: CSSTest Verify;
1316
}
14-
div#test2 {
17+
p#test2 {
1518
font-family: CSSTest Unknown, CSSTest Fallback; /* should be no 'CSSTest Unknown' font installed */
1619
}
1720
</style>
1821
</head>
1922
<body>
2023
<div><a href="http://www.w3.org/Style/CSS/Test/Fonts/">Test fonts</a> must be installed for this test: <span id="verify">FAIL</span></div>
21-
<p>Test passes if FAIL does not appear below.</p>
22-
<p>Prerequisites: these tests require that CSSTest fonts be installed.</p>
23-
<div id="test1">FAIL</div>
24-
<div id="test2">FAIL</div>
24+
<p id="test1">FAIL</p>
25+
<p id="test2">FAIL</p>
2526
</body>
2627
</html>

‎testing/web-platform/tests/css/css-fonts/font-family-name-024.xht

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
<link rel="match" href="font-family-name-024-ref.xht"/>
1010
<meta name="assert" content="System font names are only allowed with the font shorthand, not in font-family rules" />
1111
<style type="text/css">
12-
body { font-size: 36px; }
12+
body {
13+
font-size: 36px;
14+
/* prevent scrollbar because of visually empty paragraph elements */
15+
overflow: hidden;
16+
}
1317
span#verify { font-family: CSSTest Verify; }
1418
div.test { font-family: CSSTest Fallback; }
1519
p {

‎testing/web-platform/tests/css/css-fonts/test-synthetic-bold-notref.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>CSS Test: Test for synthetic bold rendering</title>
5+
<style type="text/css">
6+
div {
7+
font-size: 36px;
8+
font-family: "CSSTest Verify";
9+
}
10+
</style>
11+
</head>
12+
<body>
13+
<div><a href="http://www.w3.org/Style/CSS/Test/Fonts/">Test fonts</a> must be installed for this test: PASS</div>
14+
<p>Browser supports synthetic bolding if PASS appears on both lines and the second line appears bolder:</p>
15+
<div>PASS</div>
16+
<div>PASS</div>
17+
</body>
18+
</html>

‎testing/web-platform/tests/css/css-fonts/test-synthetic-bold.xht renamed to ‎testing/web-platform/tests/css/css-fonts/test-synthetic-bold.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
1+
<!DOCTYPE html>
2+
<html>
33
<head>
44
<title>CSS Test: Test for synthetic bold rendering</title>
55
<link rel="author" title="Mozilla" href="http://www.mozilla.com/" />
66
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-weight" />
77
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-boldness" />
88
<link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-weight-prop" />
9+
<link rel="mismatch" href="test-synthetic-bold-notref.html" />
910
<meta name="assert" content="Synthetic bold text should render differently than normal text" />
1011
<style type="text/css">
1112
div { font-size: 36px; }
12-
span#verify {font-family: "CSSTest Verify";}
13+
span#verify { font-family: "CSSTest Verify"; }
1314
div#test1 {
1415
font-family: CSSTest Verify;
1516
}
@@ -25,4 +26,4 @@
2526
<div id="test1">FAIL</div>
2627
<div id="test2">FAIL</div>
2728
</body>
28-
</html>
29+
</html>

‎testing/web-platform/tests/css/css-fonts/test-synthetic-italic-notref.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>CSS Test: Test for synthetic italic rendering</title>
5+
<style type="text/css">
6+
div { font-size: 36px; }
7+
span#verify { font-family: "CSSTest Verify"; }
8+
div#test1, div#test2 {
9+
font-family: CSSTest Verify;
10+
}
11+
</style>
12+
</head>
13+
<body>
14+
<div><a href="http://www.w3.org/Style/CSS/Test/Fonts/">Test fonts</a> must be installed for this test: <span id="verify">FAIL</span></div>
15+
<p>Browser supports synthetic italics if PASS appears on both lines and the second line is slanted right:</p>
16+
<div id="test1">FAIL</div>
17+
<div id="test2">FAIL</div>
18+
</body>
19+
</html>

‎testing/web-platform/tests/css/css-fonts/test-synthetic-italic.xht renamed to ‎testing/web-platform/tests/css/css-fonts/test-synthetic-italic.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
44
<title>CSS Test: Test for synthetic italic rendering</title>
55
<link rel="author" title="Mozilla" href="http://www.mozilla.com/" />
66
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-style" />
77
<link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-styling" />
88
<link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-style-prop"/>
9+
<link rel="mismatch" href="test-synthetic-italic-notref.html" />
910
<meta name="assert" content="Synthetic italic text should render differently than normal text" />
1011
<style type="text/css">
1112
div { font-size: 36px; }
@@ -25,4 +26,4 @@
2526
<div id="test1">FAIL</div>
2627
<div id="test2">FAIL</div>
2728
</body>
28-
</html>
29+
</html>

0 commit comments

Comments
 (0)