corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some unused list layout cruft

Browse Source
This commit is contained in:
kipp
1998-05-29 02:33:50 +00:00
parent 9d86797e97
commit 0ada969a73
6 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/generic/nsBlockFrame.h
View File

@@ -241,11 +241,6 @@ protected:
nsSize* aMaxElementSize, nsSize* aMaxElementSize,
nsBlockReflowState& aState); nsBlockReflowState& aState);
nsresult DoResizeReflow(nsBlockReflowState& aState,
const nsSize& aMaxSize,
nsRect& aDesiredRect,
nsReflowStatus& aStatus);
void ComputeDesiredRect(nsBlockReflowState& aState, void ComputeDesiredRect(nsBlockReflowState& aState,
const nsSize& aMaxSize, const nsSize& aMaxSize,
nsRect& aDesiredRect); nsRect& aDesiredRect);

7
layout/generic/nsLineLayout.cpp
View File

@@ -47,7 +47,6 @@ nsLineData::nsLineData()
mFirstContentOffset = 0; mFirstContentOffset = 0;
mLastContentOffset = 0; mLastContentOffset = 0;
mLastContentIsComplete = PR_TRUE; mLastContentIsComplete = PR_TRUE;
mHasBullet = PR_FALSE;
mIsBlock = PR_FALSE; mIsBlock = PR_FALSE;
mBounds.SetRect(0, 0, 0, 0); mBounds.SetRect(0, 0, 0, 0);
mFloaters = nsnull; mFloaters = nsnull;
@@ -88,17 +87,11 @@ nsLineData::Verify(PRBool aFinalCheck) const
nextLinesFirstChild = mNextLine->mFirstChild; nextLinesFirstChild = mNextLine->mFirstChild;
} }
// Check that number of children are ok and that the index in parent // Check that number of children are ok and that the index in parent
// information agrees with the content offsets. // information agrees with the content offsets.
PRInt32 offset = mFirstContentOffset; PRInt32 offset = mFirstContentOffset;
PRInt32 len = 0; PRInt32 len = 0;
nsIFrame* child = mFirstChild; nsIFrame* child = mFirstChild;
if (mHasBullet) {
// Skip bullet
child->GetNextSibling(child);
len++;
}
while ((nsnull != child) && (child != nextLinesFirstChild)) { while ((nsnull != child) && (child != nextLinesFirstChild)) {
PRInt32 indexInParent; PRInt32 indexInParent;
child->GetContentIndex(indexInParent); child->GetContentIndex(indexInParent);

1
layout/generic/nsLineLayout.h
View File

@@ -49,7 +49,6 @@ struct nsLineData {
PRInt32 mLastContentOffset; PRInt32 mLastContentOffset;
nsRect mBounds; nsRect mBounds;
PRPackedBool mLastContentIsComplete; PRPackedBool mLastContentIsComplete;
PRPackedBool mHasBullet;
PRPackedBool mIsBlock; PRPackedBool mIsBlock;
nsVoidArray* mFloaters; // placeholder frames for below current line floaters nsVoidArray* mFloaters; // placeholder frames for below current line floaters
}; };

5
layout/html/base/src/nsBlockFrame.h
View File

@@ -241,11 +241,6 @@ protected:
nsSize* aMaxElementSize, nsSize* aMaxElementSize,
nsBlockReflowState& aState); nsBlockReflowState& aState);
nsresult DoResizeReflow(nsBlockReflowState& aState,
const nsSize& aMaxSize,
nsRect& aDesiredRect,
nsReflowStatus& aStatus);
void ComputeDesiredRect(nsBlockReflowState& aState, void ComputeDesiredRect(nsBlockReflowState& aState,
const nsSize& aMaxSize, const nsSize& aMaxSize,
nsRect& aDesiredRect); nsRect& aDesiredRect);

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

@@ -47,7 +47,6 @@ nsLineData::nsLineData()
mFirstContentOffset = 0; mFirstContentOffset = 0;
mLastContentOffset = 0; mLastContentOffset = 0;
mLastContentIsComplete = PR_TRUE; mLastContentIsComplete = PR_TRUE;
mHasBullet = PR_FALSE;
mIsBlock = PR_FALSE; mIsBlock = PR_FALSE;
mBounds.SetRect(0, 0, 0, 0); mBounds.SetRect(0, 0, 0, 0);
mFloaters = nsnull; mFloaters = nsnull;
@@ -88,17 +87,11 @@ nsLineData::Verify(PRBool aFinalCheck) const
nextLinesFirstChild = mNextLine->mFirstChild; nextLinesFirstChild = mNextLine->mFirstChild;
} }
// Check that number of children are ok and that the index in parent // Check that number of children are ok and that the index in parent
// information agrees with the content offsets. // information agrees with the content offsets.
PRInt32 offset = mFirstContentOffset; PRInt32 offset = mFirstContentOffset;
PRInt32 len = 0; PRInt32 len = 0;
nsIFrame* child = mFirstChild; nsIFrame* child = mFirstChild;
if (mHasBullet) {
// Skip bullet
child->GetNextSibling(child);
len++;
}
while ((nsnull != child) && (child != nextLinesFirstChild)) { while ((nsnull != child) && (child != nextLinesFirstChild)) {
PRInt32 indexInParent; PRInt32 indexInParent;
child->GetContentIndex(indexInParent); child->GetContentIndex(indexInParent);

1
layout/html/base/src/nsLineLayout.h
View File

@@ -49,7 +49,6 @@ struct nsLineData {
PRInt32 mLastContentOffset; PRInt32 mLastContentOffset;
nsRect mBounds; nsRect mBounds;
PRPackedBool mLastContentIsComplete; PRPackedBool mLastContentIsComplete;
PRPackedBool mHasBullet;
PRPackedBool mIsBlock; PRPackedBool mIsBlock;
nsVoidArray* mFloaters; // placeholder frames for below current line floaters nsVoidArray* mFloaters; // placeholder frames for below current line floaters
}; };