Skip to content

Commit eb1dc5d

Browse files
frivoalfrivoal
committed
[css-contain-1][css-contain-2] Pair tests with the correct statements
1 parent a726920 commit eb1dc5d

File tree

2 files changed

+115
-97
lines changed

2 files changed

+115
-97
lines changed

‎css-contain-1/Overview.bs

+59-49
Original file line numberDiff line numberDiff line change
@@ -828,28 +828,32 @@ Size Containment</h3>
828828
* if the element does not generate a <a>principal box</a>
829829
(as is the case with ''display: contents'' or ''display: none'')
830830
* if its [=inner display type=] is ''display/table''
831+
<wpt>
832+
contain-size-012.html
833+
contain-size-012b.html
834+
</wpt>
831835
* if its [=principal box=] is
832836
an <a spec="css-display-3">internal table box</a>
837+
<wpt>
838+
contain-size-006.html
839+
contain-size-007.html
840+
contain-size-008.html
841+
contain-size-009.html
842+
contain-size-010.html
843+
contain-size-051.html
844+
contain-size-052.html
845+
</wpt>
833846
* if its [=principal box=] is
834847
an <a spec="css-display-3">internal ruby box</a>
835848
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
849+
<wpt>
850+
contain-size-002.html
851+
contain-size-003.html
852+
contain-size-004.html
853+
contain-size-005.html
836854

837-
<wpt>
838-
contain-size-001.html
839-
contain-size-002.html
840-
contain-size-003.html
841-
contain-size-004.html
842-
contain-size-005.html
843-
contain-size-006.html
844-
contain-size-007.html
845-
contain-size-008.html
846-
contain-size-009.html
847-
contain-size-010.html
848-
contain-size-012.html
849-
contain-size-012b.html
850-
contain-size-051.html
851-
contain-size-052.html
852-
</wpt>
855+
contain-size-001.html
856+
</wpt>
853857

854858
Note: Internal table boxes,
855859
which do not include table captions,
@@ -903,21 +907,6 @@ Layout Containment</h3>
903907
makes its [=principal box=] a <dfn>layout containment box</dfn>
904908
and has the following effects:
905909

906-
<wpt>
907-
contain-layout-001.html
908-
contain-layout-002.html
909-
contain-layout-003.html
910-
contain-layout-004.html
911-
contain-layout-005.html
912-
contain-layout-009.html
913-
contain-layout-010.html
914-
contain-layout-011.html
915-
contain-layout-012.html
916-
contain-layout-013.html
917-
contain-layout-014.html
918-
contain-layout-independent-formatting-context-003.html
919-
</wpt>
920-
921910
1. The [=layout containment box=] [=establishes an independent formatting context=].
922911

923912
<wpt>
@@ -1057,9 +1046,28 @@ Layout Containment</h3>
10571046
* if its [=principal box=] is
10581047
an <a spec="css-display-3">internal table box</a>
10591048
other than ''display/table-cell''
1049+
<wpt>
1050+
contain-layout-009.html
1051+
contain-layout-010.html
1052+
contain-layout-011.html
1053+
contain-layout-012.html
1054+
contain-layout-013.html
1055+
1056+
contain-layout-014.html
1057+
</wpt>
10601058
* if its [=principal box=] is
10611059
an <a spec="css-display-3">internal ruby box</a>
10621060
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
1061+
<wpt>
1062+
contain-layout-002.html
1063+
contain-layout-003.html
1064+
contain-layout-004.html
1065+
contain-layout-005.html
1066+
1067+
contain-layout-001.html
1068+
contain-layout-independent-formatting-context-003.html
1069+
</wpt>
1070+
10631071

10641072
<h4 id='containment-layout-opt' class="no-toc">
10651073
Possible Layout-Containment Optimizations</h4>
@@ -1090,23 +1098,6 @@ Paint Containment</h3>
10901098
makes its [=principal box=] a <dfn>paint containment box</dfn>
10911099
and has the following effects:
10921100

1093-
<wpt>
1094-
contain-paint-002.html
1095-
contain-paint-005.html
1096-
contain-paint-006.html
1097-
contain-paint-007.html
1098-
contain-paint-008.html
1099-
contain-paint-011.html
1100-
contain-paint-012.html
1101-
contain-paint-014.html
1102-
contain-paint-015.html
1103-
contain-paint-016.html
1104-
contain-paint-017.html
1105-
contain-paint-018.html
1106-
contain-paint-019.html
1107-
contain-paint-independent-formatting-context-003.html
1108-
</wpt>
1109-
11101101
1. The contents of the element
11111102
including any [=ink overflow|ink=] or [=scrollable overflow=]
11121103
must be clipped to the <a>padding edge</a> of the [=paint containment box=],
@@ -1185,9 +1176,28 @@ Paint Containment</h3>
11851176
* if its [=principal box=] is
11861177
an <a spec="css-display-3">internal table box</a>
11871178
other than ''display/table-cell''
1179+
<wpt>
1180+
contain-paint-014.html
1181+
contain-paint-015.html
1182+
contain-paint-016.html
1183+
contain-paint-017.html
1184+
contain-paint-018.html
1185+
contain-paint-019.html
1186+
</wpt>
11881187
* if its [=principal box=] is
11891188
an <a spec="css-display-3">internal ruby box</a>
11901189
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
1190+
<wpt>
1191+
contain-paint-005.html
1192+
contain-paint-006.html
1193+
contain-paint-007.html
1194+
contain-paint-008.html
1195+
1196+
contain-paint-002.html
1197+
contain-paint-011.html
1198+
contain-paint-012.html
1199+
contain-paint-independent-formatting-context-003.html
1200+
</wpt>
11911201

11921202
<h4 id='containment-paint-opt' class="no-toc">
11931203
Possible Paint-Containment Optimizations</h4>
@@ -1446,7 +1456,7 @@ This appendix is <em>informative</em>.
14461456
<li>Layout containment makes element act as a containing block for absolutely positioned and fixed positioned descendants.
14471457
</ul>
14481458

1449-
<!-- catch all for tests only relevant to the css-contain-2, to stop bikeshed from complaining -->
1459+
<!-- catch all for tests only relevant to the css-contain-2 or -3, to stop bikeshed from complaining -->
14501460
<wpt>
14511461
content-visibility/content-visibility-001.html
14521462
content-visibility/content-visibility-002.html

‎css-contain-2/Overview.bs

+56-48
Original file line numberDiff line numberDiff line change
@@ -660,28 +660,32 @@ Size Containment</h3>
660660
* if the element does not generate a <a>principal box</a>
661661
(as is the case with ''display: contents'' or ''display: none'')
662662
* if its [=inner display type=] is ''display/table''
663+
<wpt>
664+
contain-size-012.html
665+
contain-size-012b.html
666+
</wpt>
663667
* if its [=principal box=] is
664668
an <a spec="css-display-3">internal table box</a>
669+
<wpt>
670+
contain-size-006.html
671+
contain-size-007.html
672+
contain-size-008.html
673+
contain-size-009.html
674+
contain-size-010.html
675+
contain-size-051.html
676+
contain-size-052.html
677+
</wpt>
665678
* if its [=principal box=] is
666679
an <a spec="css-display-3">internal ruby box</a>
667680
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
681+
<wpt>
682+
contain-size-002.html
683+
contain-size-003.html
684+
contain-size-004.html
685+
contain-size-005.html
668686

669-
<wpt>
670-
contain-size-001.html
671-
contain-size-002.html
672-
contain-size-003.html
673-
contain-size-004.html
674-
contain-size-005.html
675-
contain-size-006.html
676-
contain-size-007.html
677-
contain-size-008.html
678-
contain-size-009.html
679-
contain-size-010.html
680-
contain-size-012.html
681-
contain-size-012b.html
682-
contain-size-051.html
683-
contain-size-052.html
684-
</wpt>
687+
contain-size-001.html
688+
</wpt>
685689

686690
Note: Internal table boxes,
687691
which do not include table captions,
@@ -735,21 +739,6 @@ Layout Containment</h3>
735739
makes its [=principal box=] a <dfn>layout containment box</dfn>
736740
and has the following effects:
737741

738-
<wpt>
739-
contain-layout-001.html
740-
contain-layout-002.html
741-
contain-layout-003.html
742-
contain-layout-004.html
743-
contain-layout-005.html
744-
contain-layout-009.html
745-
contain-layout-010.html
746-
contain-layout-011.html
747-
contain-layout-012.html
748-
contain-layout-013.html
749-
contain-layout-014.html
750-
contain-layout-independent-formatting-context-003.html
751-
</wpt>
752-
753742
1. The [=layout containment box=] [=establishes an independent formatting context=].
754743

755744
<wpt>
@@ -889,9 +878,27 @@ Layout Containment</h3>
889878
* if its [=principal box=] is
890879
an <a spec="css-display-3">internal table box</a>
891880
other than ''display/table-cell''
881+
<wpt>
882+
contain-layout-009.html
883+
contain-layout-010.html
884+
contain-layout-011.html
885+
contain-layout-012.html
886+
contain-layout-013.html
887+
888+
contain-layout-014.html
889+
</wpt>
892890
* if its [=principal box=] is
893891
an <a spec="css-display-3">internal ruby box</a>
894892
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
893+
<wpt>
894+
contain-layout-002.html
895+
contain-layout-003.html
896+
contain-layout-004.html
897+
contain-layout-005.html
898+
899+
contain-layout-001.html
900+
contain-layout-independent-formatting-context-003.html
901+
</wpt>
895902

896903
<h4 id='containment-layout-opt' class="no-toc">
897904
Possible Layout-Containment Optimizations</h4>
@@ -1028,23 +1035,6 @@ Paint Containment</h3>
10281035
makes its [=principal box=] a <dfn>paint containment box</dfn>
10291036
and has the following effects:
10301037

1031-
<wpt>
1032-
contain-paint-002.html
1033-
contain-paint-005.html
1034-
contain-paint-006.html
1035-
contain-paint-007.html
1036-
contain-paint-008.html
1037-
contain-paint-011.html
1038-
contain-paint-012.html
1039-
contain-paint-014.html
1040-
contain-paint-015.html
1041-
contain-paint-016.html
1042-
contain-paint-017.html
1043-
contain-paint-018.html
1044-
contain-paint-019.html
1045-
contain-paint-independent-formatting-context-003.html
1046-
</wpt>
1047-
10481038
1. The contents of the element
10491039
including any [=ink overflow|ink=] or [=scrollable overflow=]
10501040
must be clipped to the <a>overflow clip edge</a> of the [=paint containment box=],
@@ -1121,9 +1111,27 @@ Paint Containment</h3>
11211111
* if its [=principal box=] is
11221112
an <a spec="css-display-3">internal table box</a>
11231113
other than ''display/table-cell''
1114+
</wpt>
1115+
contain-paint-014.html
1116+
contain-paint-015.html
1117+
contain-paint-016.html
1118+
contain-paint-017.html
1119+
contain-paint-018.html
1120+
contain-paint-019.html
1121+
</wpt>
11241122
* if its [=principal box=] is
11251123
an <a spec="css-display-3">internal ruby box</a>
11261124
or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
1125+
<wpt>
1126+
contain-paint-005.html
1127+
contain-paint-006.html
1128+
contain-paint-007.html
1129+
contain-paint-008.html
1130+
1131+
contain-paint-011.html
1132+
contain-paint-012.html
1133+
contain-paint-002.html
1134+
contain-paint-independent-formatting-context-003.html
11271135

11281136
<h4 id='containment-paint-opt' class="no-toc">
11291137
Possible Paint-Containment Optimizations</h4>

0 commit comments

Comments
 (0)