Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-27 19:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a pending-break clear bug; use new ReflowInlineChild API

Browse Source
This commit is contained in:
kipp 1998-06-09 17:47:49 +00:00
parent 094bbe0290
commit 944ae7d0f1
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/nsLineLayout.cpp
View File

@ -675,6 +675,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
if (!didBreak && CanBreak()) {
kidFrame = mState.mKidFrame;
didBreak = PR_TRUE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
goto reflow_it_again_sam;
}
@ -783,6 +784,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
// XXX tell block what topMargin ended up being so that it can
// undo it if it ends up pushing the line.
NS_ASSERTION(0 == mPendingBreak, "whoops: uncleared break");
mSpaceManager->Translate(dx, mY);
kidFrame->WillReflow(*mPresContext);
kidFrame->MoveTo(dx, mY);
@ -845,9 +847,10 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
mBlockReflowState.mY += bottomMargin;
}
NS_ASSERTION(0 == mPendingBreak, "whoops: uncleared break");
kidFrame->WillReflow(*mPresContext);
kidFrame->MoveTo(dx, mY);
rv = mBlock->ReflowInlineChild(kidFrame, mPresContext, kidMetrics,
rv = mBlock->ReflowInlineChild(*this, kidFrame, kidMetrics,
kidReflowState, kidReflowStatus);
// See if speculative application of the margin should stick
@ -880,6 +883,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
if (!didBreak && CanBreak()) {
kidFrame = mState.mKidFrame;
didBreak = PR_TRUE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
goto reflow_it_again_sam;
}
else {

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

@ -675,6 +675,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
if (!didBreak && CanBreak()) {
kidFrame = mState.mKidFrame;
didBreak = PR_TRUE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
goto reflow_it_again_sam;
}
@ -783,6 +784,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
// XXX tell block what topMargin ended up being so that it can
// undo it if it ends up pushing the line.
NS_ASSERTION(0 == mPendingBreak, "whoops: uncleared break");
mSpaceManager->Translate(dx, mY);
kidFrame->WillReflow(*mPresContext);
kidFrame->MoveTo(dx, mY);
@ -845,9 +847,10 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
mBlockReflowState.mY += bottomMargin;
}
NS_ASSERTION(0 == mPendingBreak, "whoops: uncleared break");
kidFrame->WillReflow(*mPresContext);
kidFrame->MoveTo(dx, mY);
rv = mBlock->ReflowInlineChild(kidFrame, mPresContext, kidMetrics,
rv = mBlock->ReflowInlineChild(*this, kidFrame, kidMetrics,
kidReflowState, kidReflowStatus);
// See if speculative application of the margin should stick
@ -880,6 +883,7 @@ nsLineLayout::ReflowChild(nsIReflowCommand* aReflowCommand,
if (!didBreak && CanBreak()) {
kidFrame = mState.mKidFrame;
didBreak = PR_TRUE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
goto reflow_it_again_sam;
}
else {