From 9acfc6bd286ef21dfdb41057a1632d1892d488a2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 8 Apr 2009 13:52:37 -0700
Subject: [PATCH] Complete switch away from nsBlockReflowState::mAvailSpaceRect
 by removing the old members.  (Bug 25888)  r+sr=roc

---
 layout/generic/nsBlockReflowState.cpp | 11 -----------
 layout/generic/nsBlockReflowState.h   | 17 -----------------
 2 files changed, 28 deletions(-)

diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index e2270cd60381..3b0685779fb6 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -522,17 +522,6 @@ nsBlockReflowState::RecoverStateFrom(nsLineList::iterator aLine,
   }
 }
 
-PRBool
-nsBlockReflowState::IsImpactedByFloat() const
-{
-#ifdef REALLY_NOISY_REFLOW
-  printf("nsBlockReflowState::IsImpactedByFloat %p returned %d\n", 
-         this, mBandHasFloats);
-#endif
-  return mBandHasFloats;
-}
-
-
 PRBool
 nsBlockReflowState::InitFloat(nsLineLayout&       aLineLayout,
                               nsPlaceholderFrame* aPlaceholder,
diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h
index 558b2f4245ee..828925d6834c 100644
--- a/layout/generic/nsBlockReflowState.h
+++ b/layout/generic/nsBlockReflowState.h
@@ -101,12 +101,6 @@ public:
                                          PRBool aRelaxHeightConstraint,
                                          nsFloatManager::SavedState *aState,
                                          nsRect& aResult) const;
-  /* FIXME: To be removed */
-  void GetAvailableSpace() { GetAvailableSpace(mY, PR_FALSE); }
-  void GetAvailableSpace(nscoord aY, PRBool aRelaxHeightConstraint) {
-    mBandHasFloats =
-      GetFloatAvailableSpace(aY, aRelaxHeightConstraint, mAvailSpaceRect);
-  }
 
   /*
    * The following functions all return PR_TRUE if they were able to
@@ -197,8 +191,6 @@ public:
     }
   }
 
-  PRBool IsImpactedByFloat() const;
-
   nsLineBox* NewLineBox(nsIFrame* aFrame, PRInt32 aCount, PRBool aIsBlock);
 
   void FreeLineBox(nsLineBox* aLine);
@@ -272,10 +264,6 @@ public:
   // The current Y coordinate in the block
   nscoord mY;
 
-  // The available space within the current band.
-  // (relative to the *content*-rect of the block)
-  nsRect mAvailSpaceRect;
-
   // The combined area of all floats placed so far
   nsRect mFloatCombinedArea;
 
@@ -318,11 +306,6 @@ public:
  
   PRUint8 mFloatBreakType;
 
-  // The number of floats on the sides of mAvailSpaceRect, including
-  // floats that do not reduce mAvailSpaceRect because they are in the
-  // margins.
-  PRPackedBool mBandHasFloats;
-
   void SetFlag(PRUint32 aFlag, PRBool aValue)
   {
     NS_ASSERTION(aFlag<=BRS_LASTFLAG, "bad flag");