# HG changeset patch # Parent ecccb550e811fa9a01a9e6f23516bdde69d13767 # User Mats Palmgren Bug 907396 - Tests for display:contents. diff --git a/layout/reftests/css-display/display-contents-acid-ref.html b/layout/reftests/css-display/display-contents-acid-ref.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-acid-ref.html @@ -0,0 +1,178 @@ + + + + + CSS Test: CSS display:contents + + + + + +
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
7b
+
8
+
9
abc
+
10
+ +
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
7b
+
8
+
9
abc
+
10
+
+ +
+0  +
x 
+
y
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
8
+
9
a
+b +
c
+
10
+
+ +
+
0 
+
x 
+
y
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
8
+
9
a
+b +
c
+
10
+
+ + +
+0 +
+
+0 +
1
+2 +
+
+0
1
2 +
+
+0
1
2 +
+
+
0
1
2
+
+
+
0
+
1
+
2
+
+ + + +
+
11
+
2
+
3
+
+ +
+
11
+
2
+
3
+
+ + + +
Legendfieldset
+ + +Legend +
float:left
+
position:absolute
+ + + diff --git a/layout/reftests/css-display/display-contents-acid.html b/layout/reftests/css-display/display-contents-acid.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-acid.html @@ -0,0 +1,182 @@ + + + + + CSS Test: CSS display:contents + + + + + + +
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
7b
+
8
+
9
abc
+
10
+ +
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
7b
+
8
+
9
abc
+
10
+
+ +
+0 +
x
+
y
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
8
+
9
abc
+
10
+
+ +
+0 +
x
+
y
+
11
+
2a
2
bb
+
3
+
4
+
5a
+
5b
+
6
+
7a
+
8
+
9
abc
+
10
+
+ +
+0 +
+
+0 +
1
+2 +
+
+0 +
1
+2 +
+
+0 +
1
+2 +
+
+
0
+
1
+
2
+
+
+
0
+
1
+
2
+
+ + + +
+
11
+
2
+
3
+
+ +
+
+
11
+
2
+
3
+
+
+ + + +
Legendfieldset
+ + +Legend +
float:left
+
position:absolute
+ + + diff --git a/layout/reftests/css-display/display-contents-generated-content-ref.html b/layout/reftests/css-display/display-contents-generated-content-ref.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-generated-content-ref.html @@ -0,0 +1,119 @@ + + + + + CSS Test: CSS display:contents; generated content + + + + + + +
A a
+
t1
+
+
1B b2
+
1C c2
+
1D d2
+
1B b2
+
12
+
1D d2
+ +
+
span
+
t3
+
+
1span2
+
1span2
+
1span2
+
12
+
1span2
+
12
+
1span2
+
12
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+ +
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+ +
+ + + diff --git a/layout/reftests/css-display/display-contents-generated-content.html b/layout/reftests/css-display/display-contents-generated-content.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-generated-content.html @@ -0,0 +1,206 @@ + + + + + CSS Test: CSS display:contents; generated content + + + + + + + +
A a
+
t1
+
t2
+
1B b2
+
1C c2
+
1D d2
+
1B b2
+
1C c2
+
1D d2
+ +
+
span
+
t3
+
t4
+
1span2
+
1span2
+
1span2
+
1span2
+
1span2
+
1span2
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ +
+
span
+
1span2
+
1span2
+
1span2
+
+ + + diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html b/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html @@ -0,0 +1,110 @@ + + + + + CSS Test: CSS display:contents; style inheritance, DOM mutations + + + + + + + +
ee
 +
ee
 +
+
bord
 +
bord
 +
bord
 +
 +
+ +
 +
 +
+
 +
 +
 +
+ +
 + + + diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html b/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html @@ -0,0 +1,36 @@ + + + + + CSS Test: CSS display:contents; style inheritance + + + + +
green
 +
green
 +
+
no border
 +
no border
 +
1px green left border
 +
2px green left border
 +
+ +
green
 +
green
 +
+
1px green left border
 +
1px green left border
 +
2px green left border
 +
+ +
This text should be green
 + + + diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html b/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html @@ -0,0 +1,52 @@ + + + + + CSS Test: CSS display:contents; style inheritance, style changes + + + + + + +
green
 +
green
 +
+
no border
 +
no border
 +
1px green left border
 +
2px green left border
 +
+ +
green
 +
green
 +
+
1px green left border
 +
1px green left border
 +
2px green left border
 +
+ +
This text should be green
 + + + diff --git a/layout/reftests/css-display/display-contents-style-inheritance-1.html b/layout/reftests/css-display/display-contents-style-inheritance-1.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-style-inheritance-1.html @@ -0,0 +1,37 @@ + + + + + CSS Test: CSS display:contents; style inheritance + + + + + +
green
 +
green
 +
+
no border
 +
no border
 +
1px green left border
 +
2px green left border
 +
+ +
green
 +
green
 +
+
1px green left border
 +
1px green left border
 +
2px green left border
 +
+ +
This text should be green
 + + + diff --git a/layout/reftests/css-display/display-contents-tables-2.xhtml b/layout/reftests/css-display/display-contents-tables-2.xhtml new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-tables-2.xhtml @@ -0,0 +1,14 @@ + + + + CSS Test: CSS display:contents; tables + + + + +
green
pink diff --git a/layout/reftests/css-display/display-contents-tables-3-ref.xhtml b/layout/reftests/css-display/display-contents-tables-3-ref.xhtml new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-tables-3-ref.xhtml @@ -0,0 +1,12 @@ + + + + CSS Test: CSS display:contents; tables + + + +
green
diff --git a/layout/reftests/css-display/display-contents-tables-3.xhtml b/layout/reftests/css-display/display-contents-tables-3.xhtml new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-tables-3.xhtml @@ -0,0 +1,13 @@ + + + + CSS Test: CSS display:contents; tables + + + + +
green
diff --git a/layout/reftests/css-display/display-contents-tables-ref.xhtml b/layout/reftests/css-display/display-contents-tables-ref.xhtml new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-tables-ref.xhtml @@ -0,0 +1,12 @@ + + + + CSS Test: CSS display:contents; tables + + + +greenpink diff --git a/layout/reftests/css-display/display-contents-tables.xhtml b/layout/reftests/css-display/display-contents-tables.xhtml new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-tables.xhtml @@ -0,0 +1,13 @@ + + + + CSS Test: CSS display:contents; tables + + + + +
green
pink
diff --git a/layout/reftests/css-display/display-contents-visibility-hidden-2.html b/layout/reftests/css-display/display-contents-visibility-hidden-2.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-visibility-hidden-2.html @@ -0,0 +1,20 @@ + + + + + CSS Test: CSS display:contents; visibility:hidden + + + + + + + diff --git a/layout/reftests/css-display/display-contents-visibility-hidden-ref.html b/layout/reftests/css-display/display-contents-visibility-hidden-ref.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-visibility-hidden-ref.html @@ -0,0 +1,14 @@ + + + + + CSS Test: CSS display:contents; visibility:hidden + + + +
+ Line 1 +
+ + + diff --git a/layout/reftests/css-display/display-contents-visibility-hidden.html b/layout/reftests/css-display/display-contents-visibility-hidden.html new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/display-contents-visibility-hidden.html @@ -0,0 +1,22 @@ + + + + + CSS Test: CSS display:contents; visibility:hidden + + + + + + + + diff --git a/layout/reftests/css-display/reftest.list b/layout/reftests/css-display/reftest.list new file mode 100644 --- /dev/null +++ b/layout/reftests/css-display/reftest.list @@ -0,0 +1,13 @@ +# Tests for CSS Display spec features. +# http://dev.w3.org/csswg/css-display + +pref(layout.css.display_contents.enabled,true) == display-contents-acid.html display-contents-acid-ref.html +pref(layout.css.display_contents.enabled,true) == display-contents-generated-content.html display-contents-generated-content-ref.html +pref(layout.css.display_contents.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html +pref(layout.css.display_contents.enabled,true) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html +pref(layout.css.display_contents.enabled,true) fuzzy-if(d2d,2,100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html +pref(layout.css.display_contents.enabled,true) == display-contents-tables.xhtml display-contents-tables-ref.xhtml +pref(layout.css.display_contents.enabled,true) == display-contents-tables-2.xhtml display-contents-tables-ref.xhtml +pref(layout.css.display_contents.enabled,true) == display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml +pref(layout.css.display_contents.enabled,true) == display-contents-visibility-hidden.html display-contents-visibility-hidden-ref.html +pref(layout.css.display_contents.enabled,true) == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -55,16 +55,19 @@ include css-animations/reftest.list include css-calc/reftest.list # css character encoding tests skip-if(B2G) include css-charset/reftest.list # css default pseudo class tests skip-if(B2G) include css-default/reftest.list +# css-display spec tests +include css-display/reftest.list + # css :disable tests skip-if(Android||B2G) include css-disabled/reftest.list # css :enable tests skip-if(Android||B2G) include css-enabled/reftest.list # css @import tests skip-if(B2G) include css-import/reftest.list