Fix for 68138. r=danm, sr=waterson

content/xbl/src/nsXBLBinding.cpp

@@ -574,6 +574,22 @@ nsXBLBinding::GenerateAnonymousContent()
     // See if there's an includes attribute.
     nsAutoString includes;
     content->GetAttribute(kNameSpaceID_None, kIncludesAtom, includes);
+    
+#ifdef DEBUG
+    if (!includes.IsEmpty()) {
+      nsCAutoString id;
+      mPrototypeBinding->GetID(id);
+      nsCAutoString message("An XBL Binding with an id of ");
+      message += id;
+      message += " and found in the file ";
+      nsCAutoString uri;
+      mPrototypeBinding->GetDocURI(uri);
+      message += uri;
+      message += " is still using the deprecated\n<content includes=\"\"> syntax! Use <children> instead!\n"; 
+      NS_WARNING(message);
+    }
+#endif
+
     if (includes != NS_LITERAL_STRING("*")) {
       PRInt32 childCount;
       mBoundElement->ChildCount(childCount);
@@ -676,11 +692,7 @@ nsXBLBinding::GenerateAnonymousContent()
               insertionPoint = nsnull;
             }
 
-            if (!insertionPoint) {
-              NS_ERROR("Filtered insertion point wasn't properly constructed.\n");
-              return NS_ERROR_FAILURE;
-            }
-            else 
+            if (insertionPoint) 
               insertionPoint->AddChild(content);
           }
         }

themes/modern/global/globalBindings.xml

@@ -177,7 +177,7 @@
   </binding>
 
   <binding id="nine-slice-menulist" extends="chrome://global/content/menulistBindings.xml#menulist">
-  	<content includes="menupopup">
+  	<content>
       <xul:box class="menulist-box-left" inherits="disabled" orient="vertical">
         <xul:spring class="menulist-left-top" inherits="disabled"/>
         <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
@@ -205,6 +205,8 @@
         </xul:box>
         <xul:spring class="menulist-right-btm" inherits="disabled"/>
       </xul:box>
+
+	  <children includes="menupopup"/>
     </content>
   </binding>
 

xpfe/global/resources/content/xulBindings.xml

@@ -45,25 +45,28 @@
 
 
   <binding id="menu-menubar">
-    <content includes="menupopup">
+    <content>
       <xul:text class="menubar-text" inherits="value,accesskey,crop" crop="right"/>
+	  <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menu-menubar-iconic">
-    <content includes="menupopup">
+    <content>
       <xul:image class="menubar-left"/>
       <xul:text class="menubar-text" inherits="value,accesskey,crop" crop="right"/>
+	  <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menu">
-    <content autostretch="never" includes="menupopup">
+    <content autostretch="never">
       <xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
       <xul:text class="menu-accel" inherits="acceltext:value"/>
       <xul:box autostretch="never" class="menu-right" inherits="menuactive,disabled">
         <xul:image/>
       </xul:box>
+	  <children includes="menupopup"/>
     </content>
     <implementation>
       <property name="data" onset="this.setAttribute('data',val); return val;"
@@ -72,7 +75,7 @@
   </binding>
 
   <binding id="menuitem">
-    <content autostretch="never" includes="menupopup">
+    <content autostretch="never">
       <xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
       <xul:text class="menu-accel" inherits="value=acceltext"/>
     </content>
@@ -83,7 +86,7 @@
   </binding>
 
   <binding id="menuitem-iconic">
-    <content includes="menupopup">
+    <content>
       <xul:box class="menu-iconic-left" orient="vertical" autostretch="never" inherits="selected,menuactive,disabled,checked">
         <xul:image inherits="src"/>
       </xul:box>