backed out all changes from today (1/5/2000)

layout/forms/nsHTMLButtonControlFrame.cpp

@@ -53,7 +53,6 @@
 #include "nsColor.h"
 #include "nsIDocument.h"
 #include "nsButtonFrameRenderer.h"
-#include "nsFormControlFrame.h"
 
 static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID);
 static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID);
@@ -83,11 +82,6 @@ nsHTMLButtonControlFrame::nsHTMLButtonControlFrame()
   mTranslatedRect = nsRect(0,0,0,0);
   mDidInit = PR_FALSE;
   mRenderer.SetNameSpace(kNameSpaceID_None);
-
-  mCacheSize.width             = -1;
-  mCacheSize.height            = -1;
-  mCachedMaxElementSize.width  = -1;
-  mCachedMaxElementSize.height = -1;
 }
 
 nsHTMLButtonControlFrame::~nsHTMLButtonControlFrame()
@@ -516,12 +510,6 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext,
     nsFormFrame::AddFormControlFrame(aPresContext, *NS_STATIC_CAST(nsIFrame*, this));
   }
 
-  nsresult skiprv = nsFormControlFrame::SkipResizeReflow(mCacheSize, mCachedMaxElementSize, aPresContext, 
-                                                         aDesiredSize, aReflowState, aStatus);
-  if (NS_SUCCEEDED(skiprv)) {
-    return skiprv;
-  }
-
   // XXX remove the following when the reflow state is fixed
   ButtonHack((nsHTMLReflowState&)aReflowState, "html4 button");
 
@@ -654,17 +642,15 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext,
   //aDesiredSize.height += aReflowState.mComputedBorderPadding.top + aReflowState.mComputedBorderPadding.bottom;
 
   //adjust our max element size, if necessary
-  //if (aDesiredSize.maxElementSize) {
-    //aDesiredSize.AddBorderPaddingToMaxElementSize(aReflowState.mComputedBorderPadding);
-  //}
+  if (aDesiredSize.maxElementSize) {
+    aDesiredSize.AddBorderPaddingToMaxElementSize(aReflowState.mComputedBorderPadding);
+  }
 
   aDesiredSize.ascent  = aDesiredSize.height;
   aDesiredSize.descent = 0;
 
 
   aStatus = NS_FRAME_COMPLETE;
-
-  nsFormControlFrame::SetupCachedSizes(mCacheSize, mCachedMaxElementSize, aDesiredSize);
   return NS_OK;
 }