diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -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) {
diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h
index 836e47c4553..684644e442a 100644
--- a/mozilla/layout/generic/nsBlockFrame.h
+++ b/mozilla/layout/generic/nsBlockFrame.h
@@ -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;
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -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) {
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -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) {
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -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) {
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h
index 836e47c4553..684644e442a 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.h
+++ b/mozilla/layout/html/base/src/nsBlockFrame.h
@@ -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;
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -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) {
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 4b5c655d2ae..a0d7301816c 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -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) {