diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 5e5e784e9333..dee3f38cc575 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3054,34 +3054,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext* aPresContext, processChildren = PR_TRUE; isReplaced = PR_TRUE; rv = NS_NewMenuPopupFrame(&newFrame); - - const nsStyleDisplay* display = (const nsStyleDisplay*) - aStyleContext->GetStyleData(eStyleStruct_Display); - - // Menus scroll. - // See if it's absolute positioned or fixed positioned - if (NS_STYLE_POSITION_ABSOLUTE == position->mPosition) { - isAbsolutelyPositioned = PR_TRUE; - } else if (NS_STYLE_POSITION_FIXED == position->mPosition) { - isFixedPositioned = PR_TRUE; - } - - // Create a scroll frame - nsIFrame* scrollFrame; - NS_NewScrollFrame(&scrollFrame); - - // Initialize it (note we don't honor absolute or fixed, since this is - // going to behave a lot like the GFX combo box). - // Resolve psuedo element style for the dropdown menu - nsCOMPtr menuStyle; - rv = aPresContext->ResolvePseudoStyleContextFor(aContent, - nsXULAtoms::dropDownMenuPseudo, - aStyleContext, - PR_FALSE, - getter_AddRefs(menuStyle)); - InitializeScrollFrame(aPresContext, aState, scrollFrame, aContent, aParentFrame, - menuStyle, newFrame, PR_FALSE, PR_FALSE, PR_TRUE); - frameHasBeenInitialized = PR_TRUE; } // BOX CONSTRUCTION diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp index 5e5e784e9333..dee3f38cc575 100644 --- a/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -3054,34 +3054,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext* aPresContext, processChildren = PR_TRUE; isReplaced = PR_TRUE; rv = NS_NewMenuPopupFrame(&newFrame); - - const nsStyleDisplay* display = (const nsStyleDisplay*) - aStyleContext->GetStyleData(eStyleStruct_Display); - - // Menus scroll. - // See if it's absolute positioned or fixed positioned - if (NS_STYLE_POSITION_ABSOLUTE == position->mPosition) { - isAbsolutelyPositioned = PR_TRUE; - } else if (NS_STYLE_POSITION_FIXED == position->mPosition) { - isFixedPositioned = PR_TRUE; - } - - // Create a scroll frame - nsIFrame* scrollFrame; - NS_NewScrollFrame(&scrollFrame); - - // Initialize it (note we don't honor absolute or fixed, since this is - // going to behave a lot like the GFX combo box). - // Resolve psuedo element style for the dropdown menu - nsCOMPtr menuStyle; - rv = aPresContext->ResolvePseudoStyleContextFor(aContent, - nsXULAtoms::dropDownMenuPseudo, - aStyleContext, - PR_FALSE, - getter_AddRefs(menuStyle)); - InitializeScrollFrame(aPresContext, aState, scrollFrame, aContent, aParentFrame, - menuStyle, newFrame, PR_FALSE, PR_FALSE, PR_TRUE); - frameHasBeenInitialized = PR_TRUE; } // BOX CONSTRUCTION