Backout bug 320378 due to regression bug 389398

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) {