Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem of hitting an assert when encountering an incomplete

Browse Source 
frame when reflowing appended children


git-svn-id: svn://10.0.0.236/trunk@415 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy
1998-04-20 20:24:25 +00:00
parent bec18bf03a
commit 097598d42c
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/html/base/src/nsColumnFrame.cpp
View File

@@ -304,8 +304,6 @@ PRBool ColumnFrame::ReflowMappedChildren(nsIPresContext* aPresContext,
// Special handling for incomplete children
if (frNotComplete == status) {
// XXX It's good to assume that we might still have room
// even if the child didn't complete (floaters will want this)
nsIFrame* kidNextInFlow;
kidFrame->GetNextInFlow(kidNextInFlow);
@@ -826,9 +824,6 @@ ColumnFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
if (nsnull != pseudoFrame) {
pseudoFrame = (nsBlockFrame*) kidFrame;
}
// XXX We probably shouldn't assume that there is no room for
// the continuation
}
} while (frNotComplete == status);
NS_RELEASE(kidStyleContext);
@@ -1110,12 +1105,23 @@ NS_METHOD ColumnFrame::IncrementalReflow(nsIPresContext* aPresContext,
}
NS_RELEASE(kidSC);
// XXX Was it complete?
// Is the child complete?
if (frNotComplete == aStatus) {
// XXX Need to push remaining frames and trigger a reflow there
NS_ABORT();
// No. Create a continuing frame
nsIFrame* continuingFrame;
kidFrame->CreateContinuingFrame(aPresContext, this, continuingFrame);
// Insert the frame. We'll reflow it next pass through the loop
nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling);
continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame);
mChildCount++;
}
// Get the next child frame
prevKidFrame = kidFrame;
kidFrame->GetNextSibling(kidFrame);
}