nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1417924: Don't test <style scoped> in display: contents tests. r=heycam

Browse source 
MozReview-Commit-ID: 5RSWXHmzKRi

--HG--
extra : rebase_source : b0e2d61905115b2d6057bdc355f4cf9ebd4ea8b5
This commit is contained in:
Emilio Cobos Álvarez 2017-11-16 15:37:25 +01:00
parent 75f51aafd5
commit 13a641cf32
5 changed files with 5 additions and 69 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

38
layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html
View file

@ -92,32 +92,6 @@ function runTest() {
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>
@ -141,17 +115,5 @@ function runTest() {
<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>

4
layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
View file

@ -34,9 +34,5 @@ b { font-weight:normal; }
<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>

14
layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
View file

@ -26,6 +26,8 @@ function runTest() {
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;
@ -51,17 +53,5 @@ function runTest() {
<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>

12
layout/reftests/css-display/display-contents-style-inheritance-1.html
View file

@ -35,17 +35,5 @@ b { border:inherit; font-weight:normal; }
<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>

6
layout/reftests/css-display/reftest.list
View file

@ -7,9 +7,9 @@ fuzzy-if(Android,8,604) == display-contents-acid-dyn-2.html display-contents-aci
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