Bug 241151 nsSpringFrame was a useless subclass of nsLeafBoxFrame r/sr=roc

layout/base/nsCSSFrameConstructor.cpp

@@ -251,7 +251,7 @@ nsresult
 NS_NewDeckFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull);
 
 nsresult
-NS_NewSpringFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
+NS_NewLeafBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
 
 nsresult
 NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull);
@@ -5256,7 +5256,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell*            aPresShell,
       else if (aTag == nsXULAtoms::spring ||
                aTag == nsHTMLAtoms::spacer) {
         isReplaced = PR_TRUE;
-        rv = NS_NewSpringFrame(aPresShell, &newFrame);
+        rv = NS_NewLeafBoxFrame(aPresShell, &newFrame);
       }
        else if (aTag == nsXULAtoms::treechildren) {
         isReplaced = PR_TRUE;

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -251,7 +251,7 @@ nsresult
 NS_NewDeckFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull);
 
 nsresult
-NS_NewSpringFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
+NS_NewLeafBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
 
 nsresult
 NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull);
@@ -5256,7 +5256,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell*            aPresShell,
       else if (aTag == nsXULAtoms::spring ||
                aTag == nsHTMLAtoms::spacer) {
         isReplaced = PR_TRUE;
-        rv = NS_NewSpringFrame(aPresShell, &newFrame);
+        rv = NS_NewLeafBoxFrame(aPresShell, &newFrame);
       }
        else if (aTag == nsXULAtoms::treechildren) {
         isReplaced = PR_TRUE;

layout/xul/base/src/Makefile.in

@@ -104,7 +104,6 @@ CPPSRCS		+= \
 		nsDocElementBoxFrame.cpp \
 		nsLeafBoxFrame.cpp \
 		nsTextBoxFrame.cpp \
-		nsSpringFrame.cpp \
 		nsGroupBoxFrame.cpp \
 		nsFrameNavigator.cpp \
 		nsSplitterFrame.cpp \