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

Consolidated list handling state variables

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2628 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-05-29 18:25:14 +00:00
parent 453d1560ac
commit 7d5d32c9d9
8 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/layout/generic/nsBlockFrame.cpp
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {

5
mozilla/layout/generic/nsBlockFrame.h
View File

@ -69,8 +69,6 @@ struct nsBlockReflowState {
nsBlockFrame* mBlock;
PRBool mBlockIsPseudo;
PRBool mBlockIsListItem;
PRBool mListPositionOutside;
// Current line being reflowed
nsLineLayout* mCurrentLine;
@ -107,8 +105,9 @@ struct nsBlockReflowState {
// Array of floaters to place below current line
nsVoidArray mPendingFloaters;
// The next list ordinal for counting list bullets
PRInt32 mNextListOrdinal;
PRPackedBool mFirstChildIsInsideBullet;
PRBool mListPositionOutside;
};
//----------------------------------------------------------------------

3
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {

3
mozilla/layout/generic/nsBlockReflowState.h
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {

3
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {

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

@ -69,8 +69,6 @@ struct nsBlockReflowState {
nsBlockFrame* mBlock;
PRBool mBlockIsPseudo;
PRBool mBlockIsListItem;
PRBool mListPositionOutside;
// Current line being reflowed
nsLineLayout* mCurrentLine;
@ -107,8 +105,9 @@ struct nsBlockReflowState {
// Array of floaters to place below current line
nsVoidArray mPendingFloaters;
// The next list ordinal for counting list bullets
PRInt32 mNextListOrdinal;
PRPackedBool mFirstChildIsInsideBullet;
PRBool mListPositionOutside;
};
//----------------------------------------------------------------------

3
mozilla/layout/html/base/src/nsBlockReflowState.cpp
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {

3
mozilla/layout/html/base/src/nsBlockReflowState.h
View File

@ -111,7 +111,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mBlock = aBlock;
mSpaceManager = aSpaceManager;
mBlockIsPseudo = aBlock->IsPseudoFrame();
mBlockIsListItem = PR_FALSE;
mListPositionOutside = PR_FALSE;
mCurrentLine = nsnull;
mPrevKidFrame = nsnull;
@ -132,7 +131,6 @@ nsBlockReflowState::Initialize(nsIPresContext* aPresContext,
mPrevNegBottomMargin = 0;
mNextListOrdinal = -1;
mFirstChildIsInsideBullet = PR_FALSE;
return rv;
}
@ -1030,7 +1028,6 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext,
nsStyleDisplay* myDisplay = (nsStyleDisplay*)
mStyleContext->GetData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) {
aState.mBlockIsListItem = PR_TRUE;
nsStyleList* myList = (nsStyleList*)
mStyleContext->GetData(eStyleStruct_List);
if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) {