Bug 1404789: Remove <style scoped> test from display-contents-shadow-dom-1.html. r=bz
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 18 Oct 2017 17:45:46 +0200
changeset 683845 c9a117613499cb91da17b3aebd72d4cf97c154f9
parent 683844 c4f26703a9d0035e87077a2a6910195b7b2e366c
child 683846 1fff041708223352fbce01c0f179e44e396c7b8b
push id85474
push userbmo:emilio@crisal.io
push dateFri, 20 Oct 2017 10:02:12 +0000
reviewersbz
bugs1404789, 1345702, 1021572
milestone58.0a1
Bug 1404789: Remove <style scoped> test from display-contents-shadow-dom-1.html. r=bz I'd rather test display: contents that <style scoped> right now, given bug 1345702 and bug 1021572. MozReview-Commit-ID: A2tpsiQJxhO
layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
layout/reftests/css-display/display-contents-shadow-dom-1.html
layout/reftests/css-display/reftest.list
--- a/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
+++ b/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
@@ -37,14 +37,12 @@ span { color:blue; }
     <div>A<span>b</span>c</div>
     <div><span>b c</span>d</div>
     <div><span>a </span>b</div>
     <div><b>One</b><i>Two</i></div>
     <div><b>One</b><i>Two</i></div>
     <div><b>One</b><i>Two</i></div>
     <div><b>One</b><i>Two</i></div>
     <b style="color:blue">One</b><i style="color:blue">Two</i>Three
-    <span style="color:green">R</span>
     <div></div>
     <b style="color:green">V</b>
-    <!-- <b style="color:green">Y</b> -->
   </body>
 </html>
--- a/layout/reftests/css-display/display-contents-shadow-dom-1.html
+++ b/layout/reftests/css-display/display-contents-shadow-dom-1.html
@@ -41,22 +41,20 @@ div.after::after {content: " Y";}
     <div id="hostJ"></div>
     <span id="hostK"></span>
     <div id="hostL"></div>
     <div id="hostM"><i>Two</i><b>One</b></div>
     <div id="hostN"><i class="c">Two</i><b>One</b></div>
     <div id="hostO"><i>Two</i><b class="c">One</b></div>
     <div id="hostP"><i class="c">Two</i><b class="c">One</b></div>
     <div id="hostQ" class="c" style="color:blue"><i class="c">Two</i><b class="c">One</b></div>Three
-    <span id="hostR"><style scoped>:scope{color:green}</style></span>
     <div id="hostS" class="c"><span class="c">S</span></div>
     <div id="hostT" class="c">T</div>
     <div id="hostU"><span class="c">U</span></div>
     <div id="hostV" class="c" style="color:red"><b class="c" style="color:inherit">V</b></div>
-    <!-- TODO(bug 1021572?) <div id="hostY" class="c" style="color:red"><b>Y</b></div> -->
 
    <script>
       function shadow(id) {
         return document.getElementById(id).createShadowRoot();
       }
       function span(s) {
         var e = document.createElement("span");
         var t = document.createTextNode(s);
@@ -98,18 +96,16 @@ div.after::after {content: " Y";}
         shadow("hostJ").innerHTML = 'A<content select=".b"></content>';
         shadow("hostK").innerHTML = '<content select=".b"></content>';
         shadow("hostL").innerHTML = '<content select=".b"></content>';
         shadow("hostM").innerHTML = '<content select="b"></content><content select="i"></content>';
         shadow("hostN").innerHTML = '<content select="b"></content><content select="i"></content>';
         shadow("hostO").innerHTML = '<content select="b"></content><content select="i"></content>';
         shadow("hostP").innerHTML = '<content select="b"></content><content select="i"></content>';
         shadow("hostQ").innerHTML = '<content select="b"></content><content select="i"></content>';
-        shadow("hostR").innerHTML = '<content select="span"></content>';
-        // TODO(bug 1021572?) shadow("hostY").innerHTML = '<content select="b"><style scoped>:scope{color:green}</style></content>';
       }
 
       function tweak() {
         document.body.offsetHeight;
 
         host1.appendChild(span("1"));
         host2.appendChild(text("2"));
         host3.appendChild(span("3"));
@@ -207,18 +203,16 @@ div.after::after {content: " Y";}
         inner.className = "before";
         var e = contents(inner);
         e.className = "b";
         hostL.appendChild(e);
         var e = span("b");
         e.className = "b";
         hostL.appendChild(e);
 
-        hostR.appendChild(span("R"));
-
         document.body.offsetHeight;
         setTimeout(function() {
             shadow("hostS");
             shadow("hostT");
             shadow("hostU");
             shadow("hostV").innerHTML = '<z style="color:green"><content select="b"></content></z>';
 
             document.body.offsetHeight;
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -12,17 +12,17 @@ fails-if(styloVsGecko||stylo) pref(layou
 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-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) fails-if(stylo||styloVsGecko) pref(dom.webcomponents.enabled,true) pref(layout.css.scoped-style.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html # stylo: bug 1345702
+fuzzy-if(Android,7,1186) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
 fails-if(styloVsGecko) == display-contents-xbl-2.xul display-contents-xbl-2-ref.xul # bug 1408235
 fails-if(styloVsGecko) == display-contents-xbl-3.xul display-contents-xbl-3-ref.xul # bug 1408235
 skip == display-contents-xbl-4.xul display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
 asserts(0-1) fuzzy-if(Android,8,3216) == display-contents-fieldset.html display-contents-fieldset-ref.html # bug 1089223
 fails-if(styloVsGecko) == display-contents-xbl-5.xul display-contents-xbl-3-ref.xul # bug 1408235
 fails-if(!stylo) == display-contents-xbl-6.xhtml display-contents-xbl-6-ref.html # bug 1345809
 == display-contents-xbl-7.xhtml display-contents-xbl-7-ref.html
 == display-contents-list-item-child.html display-contents-list-item-child-ref.html