Added the other GetDesiredSize call overriding the base class call, and making it

the existing GetDesiredSize with the last param dummyed out. This makes all the sizing work
correctly with the change I put in in nsFormControlFrame

layout/forms/nsTextControlFrame.cpp

@@ -195,6 +195,14 @@ nsTextControlFrame::GetCID()
   }
 }
 
+void 
+nsTextControlFrame::GetDesiredSize(nsIPresContext* aPresContext,
+                                   const nsHTMLReflowState& aReflowState,
+                                   nsHTMLReflowMetrics& aDesiredLayoutSize)
+{
+  nsSize widgetSize;
+  GetDesiredSize(aPresContext, aReflowState, aDesiredLayoutSize, widgetSize);
+}
 
 #define DEFAULT_PIXEL_WIDTH 20
 void 

layout/forms/nsTextControlFrame.h

@@ -56,6 +56,10 @@ public:
 
 protected:
 
+  virtual void GetDesiredSize(nsIPresContext* aPresContext,
+                              const nsHTMLReflowState& aReflowState,
+                              nsHTMLReflowMetrics& aDesiredLayoutSize);
+
   virtual void GetDesiredSize(nsIPresContext* aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsHTMLReflowMetrics& aDesiredLayoutSize,

layout/html/forms/src/nsTextControlFrame.cpp

@@ -195,6 +195,14 @@ nsTextControlFrame::GetCID()
   }
 }
 
+void 
+nsTextControlFrame::GetDesiredSize(nsIPresContext* aPresContext,
+                                   const nsHTMLReflowState& aReflowState,
+                                   nsHTMLReflowMetrics& aDesiredLayoutSize)
+{
+  nsSize widgetSize;
+  GetDesiredSize(aPresContext, aReflowState, aDesiredLayoutSize, widgetSize);
+}
 
 #define DEFAULT_PIXEL_WIDTH 20
 void 

layout/html/forms/src/nsTextControlFrame.h

@@ -56,6 +56,10 @@ public:
 
 protected:
 
+  virtual void GetDesiredSize(nsIPresContext* aPresContext,
+                              const nsHTMLReflowState& aReflowState,
+                              nsHTMLReflowMetrics& aDesiredLayoutSize);
+
   virtual void GetDesiredSize(nsIPresContext* aPresContext,
                               const nsHTMLReflowState& aReflowState,
                               nsHTMLReflowMetrics& aDesiredLayoutSize,