mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
waterson%netscape.com 2001-05-16 15:51:17 +00:00
Родитель 88c1a279ff
Коммит cd26a0ea5b
2 изменённых файлов: 18 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -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;

28
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -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;