Skip to content

Commit 2ddaf04

Browse files
tkent-googlechromium-wpt-export-bot
tkent-google
authored and
chromium-wpt-export-bot
committed
css-multiple-display: Apply "shortest, most backwards-compatible serialization" only to computed values.
This CL follows resolutions of w3c/csswg-drafts#5575. * ParseDisplayMultipleKeywords() just checks validity of specified keywords, and does not reorder and shorten keywords. * Display::ApplyValue() supports unordered lists. Bug: w3c/csswg-drafts#5575 Bug: mozilla/wg-decisions#622 Bug: 995106 Change-Id: I6c916a8910b32f1d4849c68ac5595f9024bfa0f9
1 parent 4e00405 commit 2ddaf04

File tree

2 files changed

+98
-15
lines changed

2 files changed

+98
-15
lines changed

‎css/css-display/parsing/display-computed.html

Lines changed: 89 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
<script>
1919
'use strict';
2020

21-
// https://drafts.csswg.org/css-grid-1/#grid-containers
2221
test_computed_value("display", "grid");
2322
test_computed_value("display", "inline-grid");
2423

25-
// https://drafts.csswg.org/css2/visuren.html#display-prop
2624
test_computed_value("display", "inline");
2725
test_computed_value("display", "block");
2826
test_computed_value("display", "list-item");
@@ -39,11 +37,96 @@
3937
test_computed_value("display", "table-caption");
4038
test_computed_value("display", "none");
4139

42-
// https://drafts.csswg.org/css-flexbox-1/#flex-containers
43-
test_computed_value("display", "flex");
44-
test_computed_value("display", "inline-flex");
40+
test_computed_value("display", "run-in");
41+
test_computed_value("display", "flow", "block");
42+
test_computed_value("display", "flow-root");
43+
test_computed_value("display", "ruby");
4544

46-
test_computed_value("display", "contents");
45+
test_computed_value("display", "flow list-item", "list-item");
46+
test_computed_value("display", "list-item flow", "list-item");
47+
test_computed_value("display", "flow-root list-item", "flow-root list-item");
48+
test_computed_value("display", "list-item flow-root", "flow-root list-item");
49+
50+
test_computed_value("display", "block flow", "block");
51+
test_computed_value("display", "flow block", "block");
52+
test_computed_value("display", "flow-root block", "flow-root");
53+
test_computed_value("display", "block flow-root", "flow-root");
54+
test_computed_value("display", "flex block", "flex");
55+
test_computed_value("display", "block flex", "flex");
56+
test_computed_value("display", "grid block", "grid");
57+
test_computed_value("display", "block grid", "grid");
58+
test_computed_value("display", "table block", "table");
59+
test_computed_value("display", "block table", "table");
60+
test_computed_value("display", "block ruby", "block ruby");
61+
test_computed_value("display", "ruby block", "block ruby");
62+
test_computed_value("display", "block list-item", "list-item");
63+
test_computed_value("display", "list-item block", "list-item");
64+
test_computed_value("display", "flow block list-item", "list-item");
65+
test_computed_value("display", "block flow list-item", "list-item");
66+
test_computed_value("display", "flow list-item block", "list-item");
67+
test_computed_value("display", "block list-item flow", "list-item");
68+
test_computed_value("display", "list-item block flow", "list-item");
69+
test_computed_value("display", "list-item flow block", "list-item");
70+
test_computed_value("display", "flow-root block list-item", "flow-root list-item");
71+
test_computed_value("display", "block flow-root list-item", "flow-root list-item");
72+
test_computed_value("display", "flow-root list-item block", "flow-root list-item");
73+
test_computed_value("display", "block list-item flow-root", "flow-root list-item");
74+
test_computed_value("display", "list-item block flow-root", "flow-root list-item");
75+
test_computed_value("display", "list-item flow-root block", "flow-root list-item");
76+
77+
test_computed_value("display", "inline flow", "inline");
78+
test_computed_value("display", "flow inline", "inline");
79+
test_computed_value("display", "flow-root inline", "inline-block");
80+
test_computed_value("display", "inline flow-root", "inline-block");
81+
test_computed_value("display", "flex inline", "inline-flex");
82+
test_computed_value("display", "inline flex", "inline-flex");
83+
test_computed_value("display", "grid inline", "inline-grid");
84+
test_computed_value("display", "inline grid", "inline-grid");
85+
test_computed_value("display", "table inline", "inline-table");
86+
test_computed_value("display", "inline table", "inline-table");
87+
test_computed_value("display", "inline ruby", "ruby");
88+
test_computed_value("display", "ruby inline", "ruby");
89+
test_computed_value("display", "inline list-item", "inline list-item");
90+
test_computed_value("display", "list-item inline", "inline list-item");
91+
test_computed_value("display", "flow inline list-item", "inline list-item");
92+
test_computed_value("display", "inline flow list-item", "inline list-item");
93+
test_computed_value("display", "flow list-item inline", "inline list-item");
94+
test_computed_value("display", "inline list-item flow", "inline list-item");
95+
test_computed_value("display", "list-item inline flow", "inline list-item");
96+
test_computed_value("display", "list-item flow inline", "inline list-item");
97+
test_computed_value("display", "flow-root inline list-item", "inline flow-root list-item");
98+
test_computed_value("display", "inline flow-root list-item", "inline flow-root list-item");
99+
test_computed_value("display", "flow-root list-item inline", "inline flow-root list-item");
100+
test_computed_value("display", "inline list-item flow-root", "inline flow-root list-item");
101+
test_computed_value("display", "list-item inline flow-root", "inline flow-root list-item");
102+
test_computed_value("display", "list-item flow-root inline", "inline flow-root list-item");
103+
104+
test_computed_value("display", "run-in flow", "run-in");
105+
test_computed_value("display", "flow run-in", "run-in");
106+
test_computed_value("display", "flow-root run-in", "run-in flow-root");
107+
test_computed_value("display", "run-in flow-root", "run-in flow-root");
108+
test_computed_value("display", "flex run-in", "run-in flex");
109+
test_computed_value("display", "run-in flex", "run-in flex");
110+
test_computed_value("display", "grid run-in", "run-in grid");
111+
test_computed_value("display", "run-in grid", "run-in grid");
112+
test_computed_value("display", "table run-in", "run-in table");
113+
test_computed_value("display", "run-in table", "run-in table");
114+
test_computed_value("display", "run-in ruby", "run-in ruby");
115+
test_computed_value("display", "ruby run-in", "run-in ruby");
116+
test_computed_value("display", "run-in list-item", "run-in list-item");
117+
test_computed_value("display", "list-item run-in", "run-in list-item");
118+
test_computed_value("display", "flow run-in list-item", "run-in list-item");
119+
test_computed_value("display", "run-in flow list-item", "run-in list-item");
120+
test_computed_value("display", "flow list-item run-in", "run-in list-item");
121+
test_computed_value("display", "run-in list-item flow", "run-in list-item");
122+
test_computed_value("display", "list-item run-in flow", "run-in list-item");
123+
test_computed_value("display", "list-item flow run-in", "run-in list-item");
124+
test_computed_value("display", "flow-root run-in list-item", "run-in flow-root list-item");
125+
test_computed_value("display", "run-in flow-root list-item", "run-in flow-root list-item");
126+
test_computed_value("display", "flow-root list-item run-in", "run-in flow-root list-item");
127+
test_computed_value("display", "run-in list-item flow-root", "run-in flow-root list-item");
128+
test_computed_value("display", "list-item run-in flow-root", "run-in flow-root list-item");
129+
test_computed_value("display", "list-item flow-root run-in", "run-in flow-root list-item");
47130

48131
// https://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo
49132
function test_display_affected(property, value) {

‎css/css-display/parsing/display-valid.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
// https://drafts.csswg.org/css-display/#the-display-properties
4040
test_valid_value("display", "run-in");
41-
test_valid_value("display", "flow", "block");
41+
test_valid_value("display", "flow");
4242
test_valid_value("display", "flow-root");
4343
test_valid_value("display", "ruby");
4444

@@ -76,14 +76,14 @@
7676

7777
test_valid_value("display", "inline flow", "inline");
7878
test_valid_value("display", "flow inline", "inline");
79-
test_valid_value("display", "flow-root inline", "inline-block");
80-
test_valid_value("display", "inline flow-root", "inline-block");
81-
test_valid_value("display", "flex inline", "inline-flex");
82-
test_valid_value("display", "inline flex", "inline-flex");
83-
test_valid_value("display", "grid inline", "inline-grid");
84-
test_valid_value("display", "inline grid", "inline-grid");
85-
test_valid_value("display", "table inline", "inline-table");
86-
test_valid_value("display", "inline table", "inline-table");
79+
test_valid_value("display", "flow-root inline", "inline flow-root");
80+
test_valid_value("display", "inline flow-root");
81+
test_valid_value("display", "flex inline", "inline flex");
82+
test_valid_value("display", "inline flex");
83+
test_valid_value("display", "grid inline", "inline grid");
84+
test_valid_value("display", "inline grid");
85+
test_valid_value("display", "table inline", "inline table");
86+
test_valid_value("display", "inline table");
8787
test_valid_value("display", "inline ruby", "ruby");
8888
test_valid_value("display", "ruby inline", "ruby");
8989
test_valid_value("display", "inline list-item", "inline list-item");

0 commit comments

Comments
 (0)