From a59941bb2891f332bfb02eac4b11ad166bca484b Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 13 Oct 1998 22:08:34 +0000 Subject: [PATCH] Init minWidth,minHeight to keep purify happy git-svn-id: svn://10.0.0.236/trunk@12740 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/base/src/nsFrameReflowState.cpp | 4 ++-- mozilla/layout/html/base/src/nsInlineReflow.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/base/src/nsFrameReflowState.cpp b/mozilla/layout/html/base/src/nsFrameReflowState.cpp index 91517a3b33b..4386a398fc1 100644 --- a/mozilla/layout/html/base/src/nsFrameReflowState.cpp +++ b/mozilla/layout/html/base/src/nsFrameReflowState.cpp @@ -105,6 +105,8 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext) // Assume that the values are unconstrained widthConstraint = eHTMLFrameConstraint_Unconstrained; heightConstraint = eHTMLFrameConstraint_Unconstrained; + minWidth = 0; + minHeight = 0; // Some frame types are not constrained by width/height style // attributes. Return if the frame is one of those types. @@ -209,12 +211,10 @@ nsHTMLReflowState::InitConstraints(nsIPresContext& aPresContext) if (width > 0) { minWidth = width; - maxWidth = width; widthConstraint = eHTMLFrameConstraint_Constrained; } if (height > 0) { minHeight = height; - maxHeight = height; heightConstraint = eHTMLFrameConstraint_Constrained; } } diff --git a/mozilla/layout/html/base/src/nsInlineReflow.cpp b/mozilla/layout/html/base/src/nsInlineReflow.cpp index 079bb6cb446..6bbc6b5f4df 100644 --- a/mozilla/layout/html/base/src/nsInlineReflow.cpp +++ b/mozilla/layout/html/base/src/nsInlineReflow.cpp @@ -90,6 +90,7 @@ nsInlineReflow::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight) mMaxElementSize.height = 0; mUpdatedBand = PR_FALSE; mPlacedLeftFloater = PR_FALSE; + mTreatFrameAsBlock = PR_FALSE; } void