From a363dc37c368aa534b6afbf04a196dbf3ea09a6c Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Oct 1998 00:41:16 +0000
Subject: [PATCH] Setup carried out margin state for block reflow

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

diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index dff9ba43f2d..d07cd3e6b1d 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -536,10 +536,17 @@ nsInlineFrame::ComputeFinalSize(nsInlineReflowState& aState,
   if (aState.mIsMarginRoot) {
     aMetrics.mCarriedOutTopMargin = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+    aMetrics.mCarriedOutMarginFlags = 0;
   }
   else {
     aMetrics.mCarriedOutTopMargin = aState.mCollapsedTopMargin;
     aMetrics.mCarriedOutBottomMargin = aState.mPrevBottomMargin;
+    if (aInlineReflow.GetIsBlock()) {
+      aMetrics.mCarriedOutMarginFlags = aInlineReflow.GetMarginFlags();
+    }
+    else {
+      aMetrics.mCarriedOutMarginFlags = 0;
+    }
   }
 
   if (aState.mComputeMaxElementSize) {
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp
index dff9ba43f2d..d07cd3e6b1d 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.cpp
+++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp
@@ -536,10 +536,17 @@ nsInlineFrame::ComputeFinalSize(nsInlineReflowState& aState,
   if (aState.mIsMarginRoot) {
     aMetrics.mCarriedOutTopMargin = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+    aMetrics.mCarriedOutMarginFlags = 0;
   }
   else {
     aMetrics.mCarriedOutTopMargin = aState.mCollapsedTopMargin;
     aMetrics.mCarriedOutBottomMargin = aState.mPrevBottomMargin;
+    if (aInlineReflow.GetIsBlock()) {
+      aMetrics.mCarriedOutMarginFlags = aInlineReflow.GetMarginFlags();
+    }
+    else {
+      aMetrics.mCarriedOutMarginFlags = 0;
+    }
   }
 
   if (aState.mComputeMaxElementSize) {