Fix elements with max-width overlapping floats due to initial incorrect position by reflow state. b=52916 Patch by Chris Waterson. r=dbaron sr=bzbarsky

layout/generic/nsHTMLReflowState.cpp

@@ -1972,6 +1972,7 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext,
         }
 
         AdjustComputedWidth(PR_FALSE);
+        CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth);
       }
     }
   } else {

layout/html/base/src/nsHTMLReflowState.cpp

@@ -1972,6 +1972,7 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext,
         }
 
         AdjustComputedWidth(PR_FALSE);
+        CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth);
       }
     }
   } else {