Bug 1320000 - Part 1: Force xbl:children elements to be display:none. r=mrbkap
authorCameron McCormack <cam@mcc.id.au>
Thu, 01 Dec 2016 09:25:18 +0800
changeset 325204 bee6662585ed87109cb2ab1b05a16984025c95af
parent 325203 1b2237e0b5e010ae3b182e4dbe79037635ee7997
child 325205 523009ae06f6378061f2a9f4429884c33417bb7d
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmrbkap
bugs1320000
milestone53.0a1
Bug 1320000 - Part 1: Force xbl:children elements to be display:none. r=mrbkap MozReview-Commit-ID: IbM0KAIGWqi
layout/reftests/dom/reftest.list
layout/reftests/dom/xbl-children-2.xhtml
toolkit/content/xul.css
--- a/layout/reftests/dom/reftest.list
+++ b/layout/reftests/dom/reftest.list
@@ -45,11 +45,11 @@
 
 # test appending some nodes whose frame construction should be done lazily
 # followed by appending a node that might not be done lazily
 == multipleappendwithxul.xhtml multipleappendwithxul-ref.xhtml
 == multipleappendwithinput.xhtml multipleappendwithinput-ref.xhtml
 == multipleappendwitheditable.xhtml multipleappendwitheditable-ref.xhtml
 
 == xbl-children-1.xhtml xbl-children-1-ref.xhtml
-== xbl-children-2.xhtml about:blank
+fails == xbl-children-2.xhtml about:blank
 == xbl-children-3.xhtml xbl-children-3-ref.html
 == xbl-children-4.xhtml xbl-children-4-ref.html
--- a/layout/reftests/dom/xbl-children-2.xhtml
+++ b/layout/reftests/dom/xbl-children-2.xhtml
@@ -1,26 +1,29 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xbl="http://www.mozilla.org/xbl">
 <head>
   <style>
-    .forced { display:block; }
+    .forced { display: block; }
+    .forced ~ p { display: none; }
   </style>
 </head>
 <body>
   <xbl:children>
     FAIL
   </xbl:children>
 
   <xbl:children class="forced">
     FAIL
   </xbl:children>
 
   <xbl:children />
 
+  <p>FAIL</p>
+
   <script>
     var third = document.body.children[2];
     third.appendChild(document.createTextNode("FAIL"));
 
     var fourth = document.createElementNS("http://www.mozilla.org/xbl", "children");
     fourth.appendChild(document.createTextNode("FAIL"));
     document.body.appendChild(fourth);
   </script>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -45,26 +45,29 @@ window[chromehidden~="toolbar"] .chromec
 
 .uri-element {
   direction: ltr !important;
 }
 
 /****** elements that have no visual representation ******/
 
 script, data,
-xbl|children,
 commands, commandset, command,
 broadcasterset, broadcaster, observes,
 keyset, key, toolbarpalette, toolbarset,
 template, rule, conditions, action,
 bindings, binding, content, member, triple,
 treechildren, treeitem, treeseparator, treerow, treecell {
   display: none;
 }
 
+xbl|children {
+  display: none !important;
+}
+
 /********** focus rules **********/
 
 button,
 checkbox,
 colorpicker[type="button"],
 datepicker[type="grid"],
 menulist,
 radiogroup,