97253 - XBL Default Content Bug in LocateInstance, r=jag, sr=hyatt

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -989,8 +989,8 @@ nsXBLPrototypeBinding::LocateInstance(nsIContent* aBoundElement, nsIContent* aTe
     bm->GetBinding(aBoundElement, getter_AddRefs(binding));
     
     nsCOMPtr<nsIXBLBinding> currBinding = binding;
+    nsCOMPtr<nsIContent> anonContent;
     while (currBinding) {
-      nsCOMPtr<nsIContent> anonContent;
       currBinding->GetAnonymousContent(getter_AddRefs(anonContent));
       if (anonContent)
         break;
@@ -999,7 +999,10 @@ nsXBLPrototypeBinding::LocateInstance(nsIContent* aBoundElement, nsIContent* aTe
     }
 
     nsCOMPtr<nsISupportsArray> points;
-    currBinding->GetInsertionPointsFor(copyParent, getter_AddRefs(points));
+    if (anonContent == copyParent)
+      currBinding->GetInsertionPointsFor(aBoundElement, getter_AddRefs(points));
+    else
+      currBinding->GetInsertionPointsFor(copyParent, getter_AddRefs(points));
     nsCOMPtr<nsIXBLInsertionPoint> insertionPoint;
     PRUint32 count;
     points->Count(&count);

xpfe/global/resources/content/bindings/groupbox.xml

@@ -34,13 +34,11 @@
 
   <binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
     <content>
-      <xul:box inherits="orient,align,pack,dir" align="center" pack="center">
-        <children>
-          <xul:image class="caption-icon" inherits="src=image"/>
-          <xul:label class="caption-text" flex="1"
-                     inherits="default,value=label,crop,accesskey"/>
-        </children>
-      </xul:box>
+      <children>
+        <xul:image class="caption-icon" inherits="src=image"/>
+        <xul:label class="caption-text" flex="1"
+                   inherits="default,value=label,crop,accesskey"/>
+      </children>
     </content>
   </binding>