corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 81118. Back out changes to bug 43914, which regressed jrgm's tests.

Browse Source
This commit is contained in:
waterson@netscape.com
2001-05-16 15:51:17 +00:00
parent ab4d8e5a9a
commit a4166f3335
2 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
layout/generic/nsBlockFrame.cpp
View File

@@ -3566,6 +3566,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (NS_FAILED(rv)) {
return rv;
}
// Mark next line dirty in case SplitLine didn't end up
// pushing any frames.
nsLineBox* next = aLine->mNext;
if ((nsnull != next) && !next->IsBlock()) {
next->MarkDirty();
}
}
}
else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
@@ -5486,26 +5494,8 @@ nsBlockFrame::ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild)
nsLineBox* line = FindLineFor(aChild, &prevLine, &isFloater);
if (!isFloater) {
if (line) {
if (line)
MarkLineDirty(line, prevLine);
// If aChild has any continuing frames, we'll need to be sure
// to dirty those lines, too.
do {
line->MarkDirty();
line = line->mNext;
aChild->GetNextInFlow(&aChild);
// If there's a continuing frame, then we should have a next line
NS_ASSERTION(!aChild || line, "continuing frame with no next line");
// If there's a continuing frame, then the next line should
// contain the continuing frame
NS_ASSERTION(!aChild || FindLineFor(aChild, &prevLine, &isFloater) == line,
"continuing frame not on the next line");
} while (line && aChild);
}
}
else {
line = mLines;