Bug 1417924: Don't test <style scoped> in display: contents tests. r?heycam
MozReview-Commit-ID: 5RSWXHmzKRi
--- 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
@@ -87,42 +87,16 @@ function runTest() {
var e = $('t11');
var c = b("2px green left border");
var d = div('');
d.setAttribute('style','border:inherit');
d.appendChild(c);
e.appendChild(d);
- var e = $('t12');
- var c = e.firstChild;
- e.insertBefore(text("This text"), c);
- e.insertBefore(b(" should be"), c);
- e.appendChild(text(" green"));
-
- var e = $('t13');
- e.className = 'test';
-
- var e = $('t14');
- e.removeAttribute('style')
-
- var e = $('t15');
- e.innerHTML=':scope{color:green}';
- var e = $('t16');
- e.innerHTML=':scope{color:inherit}';
- var e = $('t17');
- e.innerHTML=':scope{color:inherit}';
- e.parentNode.appendChild(text("green"));
-
- var e = $('t18');
- var c = e.appendChild(div("green"));
- document.body.offsetHeight;
- document.styleSheets[8].cssRules[0].style.setProperty('color','green');
- document.body.offsetHeight;
-
document.documentElement.className = '';
}
</script>
</head>
<body onload="runTest()">
<span class="green"><div class="test" id="t1">ee</div></span>
<span class="green"><div class="test" id="t1b">ee</div>x</span>
@@ -136,22 +110,10 @@ function runTest() {
<br>
<span class="green"><div class="test" id="t7"></div></span>
<span><div class="test green" id="t8"></div></span>
<br>
<span class="border"><div class="test" id="t9"></div></span>
<span class="border"><div class="test" id="t10"></div></span>
<span class="border"><div class="test" style="border:inherit" id="t11"></div></span>
-<br>
-
-<span style="color:red"><div class="test green" id="t12"></div></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><di id="t13"v>green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div id="t14" class="test" style="color:red">green</div></span></span>
-<span style="color:red"><div class="test"><style id="t15" scoped></style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>
- <div class="test"><style scoped id="t16"></style>green</div>
- <div class="test"><style scoped id="t17"></style></div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
- <div class="test" id="t18"><style scoped>:scope{color:red}</style></div></div></span>
-
</body>
</html>
--- a/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
@@ -29,14 +29,10 @@ b { font-weight:normal; }
<br>
<span class="green"><div class="test"><div class="test">green</div></div></span>
<span><div class="test green"><div class="test">green</div></div></span>
<br>
<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test" style="border:inherit"><div class="test"><b>2px green left border</b></div></div></span>
-<br>
-
-<span><div class="green">This text should be green green green green greengreen green</div></span>
-
</body>
</html>
--- a/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
@@ -21,16 +21,18 @@ b { border:inherit; font-weight:normal;
</style>
<script>
function runTest() {
var elms = document.querySelectorAll('.test')
for (i=0; i < elms.length; ++i) {
elms[i].classList.remove('test');
elms[i].classList.add('test2');
}
+ // FIXME(emilio): This basically does a full subtree restyle, and could hide
+ // bugs in the previous parts of the test.
document.body.lang = 'foo';
document.body.offsetWidth;
document.documentElement.className = '';
}
</script>
</head>
<body onload="setTimeout(runTest,0)">
@@ -46,22 +48,10 @@ function runTest() {
<br>
<span class="green"><div class="test"><div class="test">green</div></div></span>
<span><div class="test green"><div class="test">green</div></div></span>
<br>
<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
-<br>
-
-<span style="color:red"><span class="test3 green">This text should be green</span></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
- <div class="test"><style scoped>:scope{color:green}</style>green</div>
- <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style><div class="test">
- <div id="t18" class="test"><style scoped>:scope{color:inherit}</style>green</div></div></div></span>
-
</body>
</html>
--- a/layout/reftests/css-display/display-contents-style-inheritance-1.html
+++ b/layout/reftests/css-display/display-contents-style-inheritance-1.html
@@ -30,22 +30,10 @@ b { border:inherit; font-weight:normal;
<br>
<span class="green"><div class="test"><div class="test">green</div></div></span>
<span><div class="test green"><div class="test">green</div></div></span>
<br>
<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
<span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
-<br>
-
-<span style="color:red"><div class="test green">This text should be green</div></span>
-<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
- <div class="test"><style scoped>:scope{color:green}</style>green</div>
- <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
-<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style><div class="test"><style scoped>:scope{color:red}</style>
- <div class="test"><style scoped>:scope{color:green}</style>green</div></div></div></span>
-
</body>
</html>
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -2,19 +2,19 @@
# http://dev.w3.org/csswg/css-display
fuzzy-if(Android,8,604) == display-contents-acid.html display-contents-acid-ref.html
fuzzy-if(Android,8,604) == display-contents-acid-dyn-1.html display-contents-acid-ref.html
fuzzy-if(Android,8,604) == display-contents-acid-dyn-2.html display-contents-acid-ref.html
fuzzy-if(Android,8,604) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
== display-contents-generated-content.html display-contents-generated-content-ref.html
== display-contents-generated-content-2.html display-contents-generated-content-ref.html
-fails-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
-fails-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
-fuzzy-if(winWidget,12,100) skip-if(styloVsGecko||stylo) pref(layout.css.scoped-style.enabled,true) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
+== display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
+== display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
+fuzzy-if(winWidget,12,100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
== display-contents-tables.xhtml display-contents-tables-ref.xhtml
== display-contents-tables-2.xhtml display-contents-tables-ref.xhtml
== display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml
== display-contents-visibility-hidden.html display-contents-visibility-hidden-ref.html
== display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html
== display-contents-495385-2d.html display-contents-495385-2d-ref.html
fuzzy-if(Android,7,3935) == display-contents-xbl.xhtml display-contents-xbl-ref.html
fuzzy-if(Android,7,1186) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
