From d320fcdfc740dc14051fdbf9bfb38d88583137fb Mon Sep 17 00:00:00 2001
From: "sharparrow1%yahoo.com"
 <sharparrow1%yahoo.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 26 Jul 2007 22:03:57 +0000
Subject: [PATCH] Backout bug 320378 due to regression bug 389398

git-svn-id: svn://10.0.0.236/trunk@231075 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsBlockFrame.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index a5beb82f747..598bfc0d2d9 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -1826,13 +1826,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
       // it to invalidate the dirty area if necessary
       rv = ReflowLine(aState, line, &keepGoing);
       NS_ENSURE_SUCCESS(rv, rv);
-
-      if (aState.mReflowState.mDiscoveredClearance &&
-          *aState.mReflowState.mDiscoveredClearance) {
-        line->MarkDirty();
-        return NS_OK;
-      }
-
+      
       if (line->HasFloats()) {
         reflowedFloat = PR_TRUE;
       }
@@ -2771,7 +2765,6 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
       }
       // Exactly what we do now is flexible since we'll definitely be
       // reflowed.
-      return NS_OK;
     }
   }
   if (treatWithClearance) {