зеркало из https://github.com/mozilla/gecko-dev.git
Consolidated list handling state variables
This commit is contained in:
Родитель
71909ed5ca
Коммит
24a708a050
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче