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

Made margin carried outs per-line-layout instead of per-frame

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25052 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-03-25 03:49:47 +00:00
parent 0b74b4b85a
commit 165d9cd484
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,11 @@ public:
nsReflowStatus& aReflowStatus);
nscoord GetCarriedOutTopMargin() const {
return mCurrentSpan->mLastFrame->mCarriedOutTopMargin;
return mCarriedOutTopMargin;
}
nscoord GetCarriedOutBottomMargin() const {
return mCurrentSpan->mLastFrame->mCarriedOutBottomMargin;
return mCarriedOutBottomMargin;
}
nsresult AddBulletFrame(nsIFrame* aFrame,
@ -238,6 +238,8 @@ protected:
nscoord mBottomEdge;
nscoord mMaxTopBoxHeight;
nscoord mMaxBottomBoxHeight;
nscoord mCarriedOutTopMargin;
nscoord mCarriedOutBottomMargin;
nsTextRun* mReflowTextRuns;
nsTextRun* mTextRun;
@ -264,8 +266,6 @@ protected:
nsRect mBounds;
nsSize mMaxElementSize;
nsRect mCombinedArea;
nscoord mCarriedOutTopMargin;
nscoord mCarriedOutBottomMargin;
// From reflow-state
nsMargin mMargin;

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

@ -86,11 +86,11 @@ public:
nsReflowStatus& aReflowStatus);
nscoord GetCarriedOutTopMargin() const {
return mCurrentSpan->mLastFrame->mCarriedOutTopMargin;
return mCarriedOutTopMargin;
}
nscoord GetCarriedOutBottomMargin() const {
return mCurrentSpan->mLastFrame->mCarriedOutBottomMargin;
return mCarriedOutBottomMargin;
}
nsresult AddBulletFrame(nsIFrame* aFrame,
@ -238,6 +238,8 @@ protected:
nscoord mBottomEdge;
nscoord mMaxTopBoxHeight;
nscoord mMaxBottomBoxHeight;
nscoord mCarriedOutTopMargin;
nscoord mCarriedOutBottomMargin;
nsTextRun* mReflowTextRuns;
nsTextRun* mTextRun;
@ -264,8 +266,6 @@ protected:
nsRect mBounds;
nsSize mMaxElementSize;
nsRect mCombinedArea;
nscoord mCarriedOutTopMargin;
nscoord mCarriedOutBottomMargin;
// From reflow-state
nsMargin mMargin;