зеркало из https://github.com/mozilla/gecko-dev.git
Removed carried-out-top-margin
This commit is contained in:
kipp%netscape.com
Родитель
d234006d93
Коммит
90bc4551ea
|
|
@ -31,7 +31,7 @@ nsLineBox::nsLineBox(nsIFrame* aFrame, PRInt32 aCount, PRUint16 flags)
|
|||
mNext = nsnull;
|
||||
mBounds.SetRect(0,0,0,0);
|
||||
mCombinedArea.SetRect(0,0,0,0);
|
||||
mCarriedOutTopMargin = 0;
|
||||
//XXX mCarriedOutTopMargin = 0;
|
||||
mCarriedOutBottomMargin = 0;
|
||||
mBreakType = NS_STYLE_CLEAR_NONE;
|
||||
}
|
||||
|
|
@ -82,9 +82,11 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
|
|||
char cbuf[100];
|
||||
fprintf(out, "line %p: count=%d state=%s ",
|
||||
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
|
||||
#if XXX
|
||||
if (0 != mCarriedOutTopMargin) {
|
||||
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
|
||||
}
|
||||
#endif
|
||||
if (0 != mCarriedOutBottomMargin) {
|
||||
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,9 +51,11 @@ protected:
|
|||
*/
|
||||
class nsLineBox {
|
||||
public:
|
||||
#if XXX
|
||||
nscoord GetCarriedOutTopMargin() const {
|
||||
return mCarriedOutTopMargin;
|
||||
}
|
||||
#endif
|
||||
|
||||
nscoord GetCarriedOutBottomMargin() const {
|
||||
return mCarriedOutBottomMargin;
|
||||
|
|
@ -194,7 +196,7 @@ public:
|
|||
PRUint8 mBreakType;
|
||||
nsRect mBounds;
|
||||
nsRect mCombinedArea;
|
||||
nscoord mCarriedOutTopMargin;/* XXX switch to 16 bits */
|
||||
//XXX nscoord mCarriedOutTopMargin;/* XXX switch to 16 bits */
|
||||
nscoord mCarriedOutBottomMargin;/* XXX switch to 16 bits */
|
||||
nsVoidArray* mFloaters;
|
||||
nsLineBox* mNext;
|
||||
|
|
|
|||
|
|
@ -1163,7 +1163,7 @@ nsLineLayout::PlaceFrame(PerFrameData* pfd, nsHTMLReflowMetrics& aMetrics)
|
|||
// Record ascent and update max-ascent and max-descent values
|
||||
pfd->mAscent = aMetrics.ascent;
|
||||
pfd->mDescent = aMetrics.descent;
|
||||
mCarriedOutTopMargin = aMetrics.mCarriedOutTopMargin;
|
||||
//XXX mCarriedOutTopMargin = aMetrics.mCarriedOutTopMargin;
|
||||
mCarriedOutBottomMargin = aMetrics.mCarriedOutBottomMargin;
|
||||
|
||||
// If the band was updated during the reflow of that frame then we
|
||||
|
|
|
|||
|
|
@ -85,9 +85,9 @@ public:
|
|||
nsIFrame** aNextRCFrame,
|
||||
nsReflowStatus& aReflowStatus);
|
||||
|
||||
nscoord GetCarriedOutTopMargin() const {
|
||||
return mCarriedOutTopMargin;
|
||||
}
|
||||
//XXX nscoord GetCarriedOutTopMargin() const {
|
||||
//XXX return mCarriedOutTopMargin;
|
||||
//XXX }
|
||||
|
||||
nscoord GetCarriedOutBottomMargin() const {
|
||||
return mCarriedOutBottomMargin;
|
||||
|
|
@ -243,7 +243,7 @@ protected:
|
|||
nscoord mBottomEdge;
|
||||
nscoord mMaxTopBoxHeight;
|
||||
nscoord mMaxBottomBoxHeight;
|
||||
nscoord mCarriedOutTopMargin;
|
||||
//XXX nscoord mCarriedOutTopMargin;
|
||||
nscoord mCarriedOutBottomMargin;
|
||||
|
||||
nsTextRun* mReflowTextRuns;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ nsLineBox::nsLineBox(nsIFrame* aFrame, PRInt32 aCount, PRUint16 flags)
|
|||
mNext = nsnull;
|
||||
mBounds.SetRect(0,0,0,0);
|
||||
mCombinedArea.SetRect(0,0,0,0);
|
||||
mCarriedOutTopMargin = 0;
|
||||
//XXX mCarriedOutTopMargin = 0;
|
||||
mCarriedOutBottomMargin = 0;
|
||||
mBreakType = NS_STYLE_CLEAR_NONE;
|
||||
}
|
||||
|
|
@ -82,9 +82,11 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
|
|||
char cbuf[100];
|
||||
fprintf(out, "line %p: count=%d state=%s ",
|
||||
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
|
||||
#if XXX
|
||||
if (0 != mCarriedOutTopMargin) {
|
||||
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
|
||||
}
|
||||
#endif
|
||||
if (0 != mCarriedOutBottomMargin) {
|
||||
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,9 +51,11 @@ protected:
|
|||
*/
|
||||
class nsLineBox {
|
||||
public:
|
||||
#if XXX
|
||||
nscoord GetCarriedOutTopMargin() const {
|
||||
return mCarriedOutTopMargin;
|
||||
}
|
||||
#endif
|
||||
|
||||
nscoord GetCarriedOutBottomMargin() const {
|
||||
return mCarriedOutBottomMargin;
|
||||
|
|
@ -194,7 +196,7 @@ public:
|
|||
PRUint8 mBreakType;
|
||||
nsRect mBounds;
|
||||
nsRect mCombinedArea;
|
||||
nscoord mCarriedOutTopMargin;/* XXX switch to 16 bits */
|
||||
//XXX nscoord mCarriedOutTopMargin;/* XXX switch to 16 bits */
|
||||
nscoord mCarriedOutBottomMargin;/* XXX switch to 16 bits */
|
||||
nsVoidArray* mFloaters;
|
||||
nsLineBox* mNext;
|
||||
|
|
|
|||
|
|
@ -1163,7 +1163,7 @@ nsLineLayout::PlaceFrame(PerFrameData* pfd, nsHTMLReflowMetrics& aMetrics)
|
|||
// Record ascent and update max-ascent and max-descent values
|
||||
pfd->mAscent = aMetrics.ascent;
|
||||
pfd->mDescent = aMetrics.descent;
|
||||
mCarriedOutTopMargin = aMetrics.mCarriedOutTopMargin;
|
||||
//XXX mCarriedOutTopMargin = aMetrics.mCarriedOutTopMargin;
|
||||
mCarriedOutBottomMargin = aMetrics.mCarriedOutBottomMargin;
|
||||
|
||||
// If the band was updated during the reflow of that frame then we
|
||||
|
|
|
|||
|
|
@ -85,9 +85,9 @@ public:
|
|||
nsIFrame** aNextRCFrame,
|
||||
nsReflowStatus& aReflowStatus);
|
||||
|
||||
nscoord GetCarriedOutTopMargin() const {
|
||||
return mCarriedOutTopMargin;
|
||||
}
|
||||
//XXX nscoord GetCarriedOutTopMargin() const {
|
||||
//XXX return mCarriedOutTopMargin;
|
||||
//XXX }
|
||||
|
||||
nscoord GetCarriedOutBottomMargin() const {
|
||||
return mCarriedOutBottomMargin;
|
||||
|
|
@ -243,7 +243,7 @@ protected:
|
|||
nscoord mBottomEdge;
|
||||
nscoord mMaxTopBoxHeight;
|
||||
nscoord mMaxBottomBoxHeight;
|
||||
nscoord mCarriedOutTopMargin;
|
||||
//XXX nscoord mCarriedOutTopMargin;
|
||||
nscoord mCarriedOutBottomMargin;
|
||||
|
||||
nsTextRun* mReflowTextRuns;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче