Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle completion status better

Browse Source
This commit is contained in:
kipp%netscape.com 1998-10-09 23:56:29 +00:00
parent c6db34691b
commit f558a4c64f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsInlineFrame.cpp
View File

@ -714,6 +714,9 @@ nsInlineFrame::PullUpChildren(nsInlineReflowState& aState,
nsIFrame* child = PullOneChild(nextInFlow, aState.mLastChild,
reflowStatus);
if (nsnull == child) {
if (NS_FRAME_NOT_COMPLETE == reflowStatus) {
break;
}
nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
continue;
}
@ -839,7 +842,8 @@ nsInlineFrame::ReflowFrame(nsInlineReflowState& aState,
// left in them.
nsInlineFrame* nextInFlow = (nsInlineFrame*) mNextInFlow;
while (nsnull != nextInFlow) {
if (nsnull != nextInFlow->mFirstChild) {
if ((nsnull != nextInFlow->mFirstChild) ||
(nsnull != nextInFlow->mOverflowList)) {
// One of our next-in-flows has a child remaining. Therefore
// we are not complete and must let our parent know so that
// our parent doesn't accidently remove our next-in-flows!

6
layout/html/base/src/nsInlineFrame.cpp
View File

@ -714,6 +714,9 @@ nsInlineFrame::PullUpChildren(nsInlineReflowState& aState,
nsIFrame* child = PullOneChild(nextInFlow, aState.mLastChild,
reflowStatus);
if (nsnull == child) {
if (NS_FRAME_NOT_COMPLETE == reflowStatus) {
break;
}
nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
continue;
}
@ -839,7 +842,8 @@ nsInlineFrame::ReflowFrame(nsInlineReflowState& aState,
// left in them.
nsInlineFrame* nextInFlow = (nsInlineFrame*) mNextInFlow;
while (nsnull != nextInFlow) {
if (nsnull != nextInFlow->mFirstChild) {
if ((nsnull != nextInFlow->mFirstChild) ||
(nsnull != nextInFlow->mOverflowList)) {
// One of our next-in-flows has a child remaining. Therefore
// we are not complete and must let our parent know so that
// our parent doesn't accidently remove our next-in-flows!