Bug 400813, check in the right version of the patch

This commit is contained in:
roc+@cs.cmu.edu 2008-02-14 02:03:01 -08:00
parent b278a54a54
commit 643d92dcbe

View File

@ -933,9 +933,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
}
}
}
if (hasNoncollapsedContent) {
psd->mHasNonemptyContent = PR_TRUE;
}
mSpaceManager->Translate(-tx, -ty);
@ -1014,6 +1011,10 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
if (CanPlaceFrame(pfd, reflowState, notSafeToBreak, continuingTextRun,
savedOptionalBreakContent != nsnull, metrics,
aReflowStatus, &optionalBreakAfterFits)) {
if (hasNoncollapsedContent) {
psd->mHasNonemptyContent = PR_TRUE;
}
// Place the frame, updating aBounds with the final size and
// location. Then apply the bottom+right margins (as
// appropriate) to the frame.