diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
index a71a4618fb1..67f18f36e9d 100644
--- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
@@ -214,6 +214,17 @@ nsButtonControlFrame::MouseClicked(nsIPresContext* aPresContext)
   }
 }
 
+void 
+nsButtonControlFrame::GetDesiredSize(nsIPresContext* aPresContext,
+                             const nsHTMLReflowState& aReflowState,
+                             nsHTMLReflowMetrics& aDesiredSize)
+{
+    // This "do-nothing" implementation exists to remove compiler warnings caused
+    // by the fact that GetDesiredSize is both overloaded and overridden.
+  Inherited::GetDesiredSize(aPresContext, aReflowState, aDesiredSize);
+}
+
+
 void 
 nsButtonControlFrame::GetDesiredSize(nsIPresContext*          aPresContext,
                                      const nsHTMLReflowState& aReflowState,
diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.h b/mozilla/layout/html/forms/src/nsButtonControlFrame.h
index 06852af2a40..feaf8189110 100644
--- a/mozilla/layout/html/forms/src/nsButtonControlFrame.h
+++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.h
@@ -70,6 +70,10 @@ protected:
                               nsHTMLReflowMetrics& aDesiredLayoutSize,
                               nsSize& aDesiredWidgetSize);
 
+  virtual void GetDesiredSize(nsIPresContext* aPresContext,
+                              const nsHTMLReflowState& aReflowState,
+                              nsHTMLReflowMetrics& aDesiredSize);
+
 
   
   virtual void Redraw();