Bug 366531 - "deCOMtaminate nsBox.h [BoundsCheck()]" (additional fixes) [p=ldx@users.sourceforge.net (Lorenzo Dieryckx) r+sr+a1.9=roc]

layout/xul/base/src/grid/nsGridRowLeafLayout.cpp

@@ -219,6 +219,7 @@ nsGridRowLeafLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, ns
       }
     
      // initialize the box size here 
+     max = PR_MAX(min, max);
      pref = nsBox::BoundsCheck(min, pref, max);
    
      current = new (aState) nsBoxSize();

layout/xul/base/src/nsSprocketLayout.cpp

@@ -920,6 +920,7 @@ nsSprocketLayout::PopulateBoxSizes(nsIBox* aBox, nsBoxLayoutState& aState, nsBox
 
   // we specified all our children are equal size;
   if (frameState & NS_STATE_EQUAL_SIZE) {
+    smallestMaxWidth = PR_MAX(smallestMaxWidth, biggestMinWidth);
     biggestPrefWidth = nsBox::BoundsCheck(biggestMinWidth, biggestPrefWidth, smallestMaxWidth);
 
     currentBox = aBoxSizes;