Fix long-standing XBL bug where we didn't update insertion points correctly insome cases. Bug 375299, r+sr=sicking

content/xbl/src/nsBindingManager.cpp

@@ -1179,7 +1179,8 @@ nsBindingManager::ContentAppended(nsIDocument* aDocument,
                                   PRInt32     aNewIndexInContainer)
 {
   // XXX This is hacked and not quite correct. See below.
-  if (aNewIndexInContainer != -1 && mContentListTable.ops) {
+  if (aNewIndexInContainer != -1 &&
+      (mContentListTable.ops || mAnonymousNodesTable.ops)) {
     // It's not anonymous.
     PRInt32 childCount = aContainer->GetChildCount();
 
@@ -1230,7 +1231,8 @@ nsBindingManager::ContentInserted(nsIDocument* aDocument,
                                   PRInt32 aIndexInContainer)
 {
   // XXX This is hacked just to make menus work again.
-  if (aIndexInContainer != -1 && mContentListTable.ops) {
+  if (aIndexInContainer != -1 &&
+      (mContentListTable.ops || mAnonymousNodesTable.ops)) {
     // It's not anonymous.
     nsCOMPtr<nsIContent> ins = GetNestedInsertionPoint(aContainer, aChild);
 
@@ -1304,7 +1306,8 @@ nsBindingManager::ContentRemoved(nsIDocument* aDocument,
                                      (aDocument, aContainer, aChild,
                                       aIndexInContainer));  
 
-  if (aIndexInContainer == -1 || !mContentListTable.ops)
+  if (aIndexInContainer == -1 ||
+      (!mContentListTable.ops && !mAnonymousNodesTable.ops))
     // It's anonymous.
     return;