From a06e2c19f8fcf8ec0b5be06ed8ad3aa3f631817d Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 18 Jan 2004 06:06:13 +0000
Subject: [PATCH] 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

git-svn-id: svn://10.0.0.236/trunk@151483 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsHTMLReflowState.cpp       | 1 +
 mozilla/layout/html/base/src/nsHTMLReflowState.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp
index 0b715aa4baf..1959a3db516 100644
--- a/mozilla/layout/generic/nsHTMLReflowState.cpp
+++ b/mozilla/layout/generic/nsHTMLReflowState.cpp
@@ -1972,6 +1972,7 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext,
         }
 
         AdjustComputedWidth(PR_FALSE);
+        CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth);
       }
     }
   } else {
diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
index 0b715aa4baf..1959a3db516 100644
--- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp
@@ -1972,6 +1972,7 @@ nsHTMLReflowState::ComputeBlockBoxData(nsIPresContext* aPresContext,
         }
 
         AdjustComputedWidth(PR_FALSE);
+        CalculateBlockSideMargins(cbrs->mComputedWidth, mComputedWidth);
       }
     }
   } else {