Backout bug 320378 due to regression bug 389398

git-svn-id: svn://10.0.0.236/trunk@231075 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sharparrow1%yahoo.com
2007-07-26 22:03:57 +00:00
parent 86b4452ff5
commit d320fcdfc7

View File

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