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