Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-24 05:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't create new frames when a continuation is being reflowed for the first time

Browse Source
This commit is contained in:
kipp%netscape.com 1998-07-17 16:16:19 +00:00
parent d5d6ee498a
commit 316e166f7b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/css/layout/src/nsCSSBlockFrame.cpp
View File

@ -166,7 +166,7 @@ protected:
#endif
virtual PRBool DeleteNextInFlowsFor(nsIFrame* aNextInFlow);
nsresult DrainOverflowLines();
PRBool DrainOverflowLines();
PRBool RemoveChild(LineData* aLines, nsIFrame* aChild);
@ -1230,8 +1230,12 @@ nsCSSBlockFrame::Reflow(nsIPresContext& aPresContext,
nsresult rv = NS_OK;
if (eReflowReason_Initial == state.reason) {
DrainOverflowLines();
rv = InitialReflow(state);
if (!DrainOverflowLines()) {
rv = InitialReflow(state);
}
else {
rv = ResizeReflow(state);
}
mState &= ~NS_FRAME_FIRST_REFLOW;
}
else if (eReflowReason_Incremental == state.reason) {
@ -2731,14 +2735,17 @@ nsCSSBlockFrame::PushLines(nsCSSBlockReflowState& aState)
#endif
}
nsresult
PRBool
nsCSSBlockFrame::DrainOverflowLines()
{
PRBool drained = PR_FALSE;
// First grab the prev-in-flows overflow lines
nsCSSBlockFrame* prevBlock = (nsCSSBlockFrame*) mPrevInFlow;
if (nsnull != prevBlock) {
LineData* line = prevBlock->mOverflowLines;
if (nsnull != line) {
drained = PR_TRUE;
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsCSSBlockFrame::DrainOverflowLines: line=%p prevInFlow=%p",
line, prevBlock));
@ -2803,6 +2810,7 @@ nsCSSBlockFrame::DrainOverflowLines()
lastLine->LastChild()->GetContentIndex(mLastContentOffset);
}
mOverflowLines = nsnull;
drained = PR_TRUE;
}
#ifdef NS_DEBUG
@ -2810,7 +2818,7 @@ nsCSSBlockFrame::DrainOverflowLines()
VerifyChildCount(mLines, PR_TRUE);
}
#endif
return NS_OK;
return drained;
}
// XXX a copy of nsHTMLContainerFrame's