Bug 487831: Remove nsBox::(Get|Set)WasCollapsed, which are totally unused. r+sr=dbaron

layout/generic/nsFrame.cpp

@@ -146,8 +146,6 @@ struct nsBoxLayoutMetrics
   nscoord mAscent;
 
   nsSize mLastSize;
-
-  PRPackedBool mWasCollapsed;
 };
 
 struct nsContentAndOffset
@@ -6765,18 +6763,6 @@ nsFrame::BoxReflow(nsBoxLayoutState&        aState,
   return NS_OK;
 }
 
-PRBool
-nsFrame::GetWasCollapsed(nsBoxLayoutState& aState)
-{
-  return BoxMetrics()->mWasCollapsed;
-}
-
-void
-nsFrame::SetWasCollapsed(nsBoxLayoutState& aState, PRBool aCollapsed)
-{
-  BoxMetrics()->mWasCollapsed = aCollapsed;
-}
-
 nsBoxLayoutMetrics*
 nsFrame::BoxMetrics() const
 {
@@ -6829,7 +6815,6 @@ nsFrame::InitBoxMetrics(PRBool aClear)
   nsFrame::MarkIntrinsicWidthsDirty();
   metrics->mBlockAscent = 0;
   metrics->mLastSize.SizeTo(0, 0);
-  metrics->mWasCollapsed = PR_FALSE;
 }
 
 // Box layout debugging

layout/generic/nsFrame.h

@@ -598,9 +598,6 @@ protected:
   virtual void GetBoxName(nsAutoString& aName);
 #endif
 
-  virtual PRBool GetWasCollapsed(nsBoxLayoutState& aState);
-  virtual void SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas);
-
   void InitBoxMetrics(PRBool aClear);
   nsBoxLayoutMetrics* BoxMetrics() const;
 

layout/xul/base/src/nsBox.cpp

@@ -421,21 +421,6 @@ nsBox::DoesNeedRecalc(nscoord aCoord)
   return (aCoord == -1);
 }
 
-PRBool
-nsBox::GetWasCollapsed(nsBoxLayoutState& aState)
-{
-  return (GetStateBits() & NS_STATE_IS_COLLAPSED) != 0;
-}
-
-void
-nsBox::SetWasCollapsed(nsBoxLayoutState& aState, PRBool aCollapsed)
-{
-  if (aCollapsed)
-     AddStateBits(NS_STATE_IS_COLLAPSED);
-  else
-     RemoveStateBits(NS_STATE_IS_COLLAPSED);
-}
-
 NS_IMETHODIMP
 nsBox::SetLayoutManager(nsIBoxLayout* aLayout)
 {

layout/xul/base/src/nsBox.h

@@ -129,8 +129,6 @@ protected:
   virtual void ListBox(nsAutoString& aResult);
 #endif
   
-  virtual PRBool GetWasCollapsed(nsBoxLayoutState& aState);
-  virtual void SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas);
   virtual PRBool GetDefaultFlex(PRInt32& aFlex);
   virtual void GetLayoutFlags(PRUint32& aFlags);
 

layout/xul/base/src/nsBoxFrame.cpp

@@ -2143,18 +2143,6 @@ nsBoxFrame::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild)
   return NS_OK;
 }
 
-PRBool
-nsBoxFrame::GetWasCollapsed(nsBoxLayoutState& aState)
-{
-  return nsBox::GetWasCollapsed(aState);
-}
-
-void
-nsBoxFrame::SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas)
-{
-  nsBox::SetWasCollapsed(aState, aWas);
-}
-
 /**
  * This wrapper class lets us redirect mouse hits from descendant frames
  * of a menu to the menu itself, if they didn't specify 'allowevents'.

layout/xul/base/src/nsBoxFrame.h

@@ -59,7 +59,7 @@ class nsBoxLayoutState;
 #define NS_STATE_CURRENTLY_IN_DEBUG      0x02000000
 //#define NS_STATE_SET_TO_DEBUG            0x04000000  moved to nsBox.h
 //#define NS_STATE_DEBUG_WAS_SET           0x08000000  moved to nsBox.h
-#define NS_STATE_IS_COLLAPSED            0x10000000
+//                                         0x10000000  not used anymore
 #define NS_STATE_BOX_WRAPS_KIDS_IN_BLOCK 0x20000000
 #define NS_STATE_EQUAL_SIZE              0x40000000
 //#define NS_STATE_IS_DIRECTION_NORMAL     0x80000000  moved to nsIFrame.h
@@ -233,9 +233,6 @@ protected:
                               nsPoint aPt);
 #endif
 
-    virtual PRBool GetWasCollapsed(nsBoxLayoutState& aState);
-    virtual void SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas);
-
     virtual PRBool GetInitialEqualSize(PRBool& aEqualSize); 
     virtual void GetInitialOrientation(PRBool& aIsHorizontal);
     virtual void GetInitialDirection(PRBool& aIsNormal);

layout/xul/base/src/nsLeafBoxFrame.cpp

@@ -447,15 +447,3 @@ nsLeafBoxFrame::DoLayout(nsBoxLayoutState& aState)
 {
     return nsBox::DoLayout(aState);
 }
-
-PRBool
-nsLeafBoxFrame::GetWasCollapsed(nsBoxLayoutState& aState)
-{
-    return nsBox::GetWasCollapsed(aState);
-}
-
-void
-nsLeafBoxFrame::SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas)
-{
-    nsBox::SetWasCollapsed(aState, aWas);
-}

layout/xul/base/src/nsLeafBoxFrame.h

@@ -110,9 +110,6 @@ public:
 
 protected:
 
-  virtual PRBool GetWasCollapsed(nsBoxLayoutState& aState);
-  virtual void SetWasCollapsed(nsBoxLayoutState& aState, PRBool aWas);
-
   NS_IMETHOD DoLayout(nsBoxLayoutState& aState);
 
 #ifdef DEBUG_LAYOUT