Skip to content

Commit 5478c7c

Browse files
author
bors-servo
committed
Auto merge of servo#7505 - frewsxcv:bump-wpt-css-tests, r=jdm
Update CSS tests to revision c8ec30de8099360ecf6581035bfdf2180fcc9755 Necessary for: servo#7117 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7505) <!-- Reviewable:end -->
2 parents 04b21fa + c51deb9 commit 5478c7c

File tree

156 files changed

+13567
-533
lines changed

Some content is hidden

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

156 files changed

+13567
-533
lines changed

‎tests/wpt/css-tests/css-writing-modes-3_dev/html/border-conflict-element-vlr-003.htm

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
2+
<html>
3+
4+
<head>
5+
6+
<title>CSS Writing Modes Test: Border conflict resolution - adjacent cells with same border styles in a 'vertical-lr' table with 'direction: ltr' (basic)</title>
7+
8+
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
9+
<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-directions" title="6.2 Flow-relative Directions">
10+
<link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
11+
<link rel="match" href="reference/ref-filled-green-100px-square.htm">
12+
13+
<meta content="" name="flags">
14+
<meta content="When two adjacent cells have the same 'border-width' value and the same 'border-style' value in a 'border-collapse: collapse' table, then the color of the border of the cell closest to line-left side wins (if the table's 'direction' is 'ltr'; line-right side, if it is 'rtl') and the color of the border of the cell closest to block-start side wins." name="assert">
15+
16+
<style type="text/css">
17+
table
18+
{
19+
border-collapse: collapse;
20+
direction: ltr;
21+
writing-mode: vertical-lr;
22+
}
23+
24+
td
25+
{
26+
padding: 0px;
27+
}
28+
29+
td#five
30+
{
31+
border-bottom-color: green;
32+
border-bottom-style: solid;
33+
border-bottom-width: 100px;
34+
}
35+
36+
td#six
37+
{
38+
border-top-color: red;
39+
border-top-style: solid;
40+
border-top-width: 100px;
41+
width: 100px;
42+
}
43+
</style>
44+
45+
</head>
46+
47+
<body>
48+
49+
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
50+
51+
<table>
52+
53+
<tr>
54+
<td></td> <td></td> <td></td>
55+
</tr>
56+
57+
<tr>
58+
<td></td> <td id="five"></td> <td id="six"></td>
59+
</tr>
60+
61+
<tr>
62+
<td></td> <td></td> <td></td>
63+
</tr>
64+
65+
</table>
66+
67+
</body>
68+
</html>

‎tests/wpt/css-tests/css-writing-modes-3_dev/html/border-conflict-element-vlr-005.htm

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
2+
<html>
3+
4+
<head>
5+
6+
<title>CSS Writing Modes Test: Border conflict resolution - adjacent cells with same border styles in a 'vertical-lr' table with 'direction: ltr' (basic)</title>
7+
8+
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
9+
<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-directions" title="6.2 Flow-relative Directions">
10+
<link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
11+
<link rel="match" href="reference/ref-filled-green-100px-square.htm">
12+
13+
<meta content="" name="flags">
14+
<meta content="When two adjacent cells have the same 'border-width' value and the same 'border-style' value in a 'border-collapse: collapse' table, then the color of the border of the cell closest to line-left side wins (if the table's 'direction' is 'ltr'; line-right side, if it is 'rtl') and the color of the border of the cell closest to block-start side wins." name="assert">
15+
16+
<style type="text/css">
17+
table
18+
{
19+
border-collapse: collapse;
20+
direction: ltr;
21+
writing-mode: vertical-lr;
22+
}
23+
24+
td
25+
{
26+
padding: 0px;
27+
}
28+
29+
td#five
30+
{
31+
border-right-color: green;
32+
border-right-style: solid;
33+
border-right-width: 100px;
34+
}
35+
36+
td#eight
37+
{
38+
border-left-color: red;
39+
border-left-style: solid;
40+
border-left-width: 100px;
41+
height: 100px;
42+
}
43+
</style>
44+
45+
</head>
46+
47+
<body>
48+
49+
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
50+
51+
<table>
52+
53+
<tr>
54+
<td></td> <td></td> <td></td>
55+
</tr>
56+
57+
<tr>
58+
<td></td> <td id="five"></td> <td></td>
59+
</tr>
60+
61+
<tr>
62+
<td></td> <td id="eight"></td> <td></td>
63+
</tr>
64+
65+
</table>
66+
67+
</body>
68+
</html>

‎tests/wpt/css-tests/css-writing-modes-3_dev/html/border-conflict-element-vlr-007.htm

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
2+
<html>
3+
4+
<head>
5+
6+
<title>CSS Writing Modes Test: Border conflict resolution - adjacent cells with same border styles in a 'vertical-lr' table with 'direction: ltr' (complex)</title>
7+
8+
<!--
9+
Original (and horizontal-tb) test is
10+
http://test.csswg.org/suites/css2.1/nightly-unstable/html4/border-conflict-element-001a.htm
11+
-->
12+
13+
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
14+
<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-directions" title="6.2 Flow-relative Directions">
15+
<link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
16+
<link rel="match" href="reference/ref-filled-green-100px-square.htm">
17+
18+
<meta content="" name="flags">
19+
<meta content="When two adjacent cells have the same 'border-width' value and the same 'border-style' value in a 'border-collapse: collapse' table, then the color of the border of the cell closest to line-left side wins (if the table's 'direction' is 'ltr'; line-right side, if it is 'rtl') and the color of the border of the cell closest to block-start side wins." name="assert">
20+
21+
<style type="text/css">
22+
table
23+
{
24+
border-collapse: collapse;
25+
direction: ltr;
26+
writing-mode: vertical-lr;
27+
}
28+
29+
td
30+
{
31+
border-style: solid solid solid solid;
32+
border-width: 20px 20px 20px 20px;
33+
padding: 0px;
34+
}
35+
36+
td#one
37+
{
38+
border-color: green green green green;
39+
}
40+
41+
td#two
42+
{
43+
border-color: red green green green;
44+
}
45+
46+
td#three
47+
{
48+
border-color: red green green green;
49+
}
50+
51+
td#four
52+
{
53+
border-color: red green green green;
54+
}
55+
56+
57+
58+
td#five
59+
{
60+
border-color: green green green red;
61+
}
62+
63+
td#six
64+
{
65+
border-color: red green green red;
66+
}
67+
68+
td#seven
69+
{
70+
border-color: red green green red;
71+
}
72+
73+
td#eight
74+
{
75+
border-color: red green green red;
76+
}
77+
78+
79+
80+
td#nine
81+
{
82+
border-color: green green green red;
83+
}
84+
85+
td#ten
86+
{
87+
border-color: red green green red;
88+
}
89+
90+
td#eleven
91+
{
92+
border-color: red green green red;
93+
}
94+
95+
td#twelve
96+
{
97+
border-color: red green green red;
98+
}
99+
100+
101+
102+
td#thirteen
103+
{
104+
border-color: green green green red;
105+
}
106+
107+
td#fourteen
108+
{
109+
border-color: red green green red;
110+
}
111+
112+
td#fifteen
113+
{
114+
border-color: red green green red;
115+
}
116+
117+
td#sixteen
118+
{
119+
border-color: red green green red;
120+
}
121+
</style>
122+
123+
</head>
124+
125+
<body>
126+
127+
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
128+
129+
<table>
130+
131+
<tr>
132+
<td id="one"></td> <td id="two"></td> <td id="three"></td> <td id="four"></td>
133+
</tr>
134+
135+
<tr>
136+
<td id="five"></td> <td id="six"></td> <td id="seven"></td> <td id="eight"></td>
137+
</tr>
138+
139+
<tr>
140+
<td id="nine"></td> <td id="ten"></td> <td id="eleven"></td> <td id="twelve"></td>
141+
</tr>
142+
143+
<tr>
144+
<td id="thirteen"></td> <td id="fourteen"></td> <td id="fifteen"></td> <td id="sixteen"></td>
145+
</tr>
146+
147+
</table>
148+
149+
</body>
150+
</html>

0 commit comments

Comments
 (0)