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

Use new mPendingBreak state

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2748 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-05-30 17:46:11 +00:00
parent 5f78a9d123
commit 6afff43de1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/generic/nsLineLayout.cpp
View File

@ -216,7 +216,7 @@ nsLineLayout::Initialize(nsBlockReflowState& aState, nsLineData* aLine)
mSavedState.mKidFrame = nsnull;
mBreakFrame = nsnull;
mPendingLineBreak = PR_FALSE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
mLine = aLine;
mKidPrevInFlow = nsnull;
@ -923,8 +923,12 @@ nsLineLayout::PlaceChild(nsRect& kidRect,
if (NS_FRAME_IS_COMPLETE(kidReflowStatus)) {
mLine->mLastContentIsComplete = PR_TRUE;
if (mLine->mIsBlock ||
(NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER == mReflowResult)) {
(NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER == mReflowResult) ||
(NS_STYLE_CLEAR_NONE != mPendingBreak)) {
rv = NS_LINE_LAYOUT_BREAK_AFTER;
if (NS_STYLE_CLEAR_LINE == mPendingBreak) {
mPendingBreak = NS_STYLE_CLEAR_NONE;
}
}
mKidPrevInFlow = nsnull;
}

6
mozilla/layout/generic/nsLineLayout.h
View File

@ -123,10 +123,6 @@ struct nsLineLayout {
mState.mColumn = aNewColumn;
}
void LineBreak() {
mPendingLineBreak = PR_TRUE;
}
// A value set by line-layout cognizant frames. Frames that are not
// aware of line layout leave the value unchanged and can thus be
// detected by the line-layout algorithm.
@ -157,7 +153,7 @@ struct nsLineLayout {
// requested then this is where the line will break at.
nsIFrame* mBreakFrame;
nscoord mBreakX;
PRBool mPendingLineBreak;
PRUint8 mPendingBreak;
// XXX ick
// This is set by the block code when it updates the available

8
mozilla/layout/html/base/src/nsLineLayout.cpp
View File

@ -216,7 +216,7 @@ nsLineLayout::Initialize(nsBlockReflowState& aState, nsLineData* aLine)
mSavedState.mKidFrame = nsnull;
mBreakFrame = nsnull;
mPendingLineBreak = PR_FALSE;
mPendingBreak = NS_STYLE_CLEAR_NONE;
mLine = aLine;
mKidPrevInFlow = nsnull;
@ -923,8 +923,12 @@ nsLineLayout::PlaceChild(nsRect& kidRect,
if (NS_FRAME_IS_COMPLETE(kidReflowStatus)) {
mLine->mLastContentIsComplete = PR_TRUE;
if (mLine->mIsBlock ||
(NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER == mReflowResult)) {
(NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER == mReflowResult) ||
(NS_STYLE_CLEAR_NONE != mPendingBreak)) {
rv = NS_LINE_LAYOUT_BREAK_AFTER;
if (NS_STYLE_CLEAR_LINE == mPendingBreak) {
mPendingBreak = NS_STYLE_CLEAR_NONE;
}
}
mKidPrevInFlow = nsnull;
}

6
mozilla/layout/html/base/src/nsLineLayout.h
View File

@ -123,10 +123,6 @@ struct nsLineLayout {
mState.mColumn = aNewColumn;
}
void LineBreak() {
mPendingLineBreak = PR_TRUE;
}
// A value set by line-layout cognizant frames. Frames that are not
// aware of line layout leave the value unchanged and can thus be
// detected by the line-layout algorithm.
@ -157,7 +153,7 @@ struct nsLineLayout {
// requested then this is where the line will break at.
nsIFrame* mBreakFrame;
nscoord mBreakX;
PRBool mPendingLineBreak;
PRUint8 mPendingBreak;
// XXX ick
// This is set by the block code when it updates the available