Fix for 46757. r=hyatt.

layout/xul/base/src/nsMenuFrame.cpp

@@ -61,7 +61,7 @@
 #include "nsIViewManager.h"
 #include "nsIBindingManager.h"
 
-#define NS_MENU_POPUP_LIST_INDEX   (NS_AREA_FRAME_ABSOLUTE_LIST_INDEX + 1)
+#define NS_MENU_POPUP_LIST_INDEX   0
 
 static PRInt32 gEatMouseMove = PR_FALSE;
 
@@ -229,7 +229,15 @@ NS_IMETHODIMP
 nsMenuFrame::GetAdditionalChildListName(PRInt32   aIndex,
                                         nsIAtom** aListName) const
 {
-  return nsBoxFrame::GetAdditionalChildListName(aIndex, aListName);
+  NS_PRECONDITION(nsnull != aListName, "null OUT parameter pointer");
+
+  *aListName = nsnull;
+  if (NS_MENU_POPUP_LIST_INDEX == aIndex) {
+    *aListName = nsLayoutAtoms::popupList;
+    NS_ADDREF(*aListName);
+  }
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP

layout/xul/base/src/nsPopupSetFrame.cpp

@@ -53,7 +53,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsIScrollableFrame.h"
 
-#define NS_MENU_POPUP_LIST_INDEX   (NS_AREA_FRAME_ABSOLUTE_LIST_INDEX + 1)
+#define NS_MENU_POPUP_LIST_INDEX   0
 
 //
 // NS_NewPopupSetFrame
@@ -180,19 +180,20 @@ NS_IMETHODIMP
 nsPopupSetFrame::GetAdditionalChildListName(PRInt32   aIndex,
                                         nsIAtom** aListName) const
 {
-   // Maintain a separate child list for the menu contents.
-   // This is necessary because we don't want the menu contents to be included in the layout
-   // of the menu's single item because it would take up space, when it is supposed to
-   // be floating above the display.
-  /*NS_PRECONDITION(nsnull != aListName, "null OUT parameter pointer");
+  // Maintain a separate child list for the menu contents.
+  // This is necessary because we don't want the menu contents to be included in the layout
+  // of the menu's single item because it would take up space, when it is supposed to
+  // be floating above the display.
+
+  NS_PRECONDITION(nsnull != aListName, "null OUT parameter pointer");
   
   *aListName = nsnull;
   if (NS_MENU_POPUP_LIST_INDEX == aIndex) {
     *aListName = nsLayoutAtoms::popupList;
     NS_ADDREF(*aListName);
-    return NS_OK;
-  }*/
-  return nsBoxFrame::GetAdditionalChildListName(aIndex, aListName);
+  }
+
+  return NS_OK;
 }
 
 NS_IMETHODIMP