Bug 837000: Remove nsBlockReflowState.h's essentially-unnecessary #include of nsBlockFrame.h (and related cleanup). r=dbaron

layout/generic/nsBlockReflowState.cpp

@@ -6,10 +6,11 @@
 
 /* state used in reflow of block frames */
 
+#include "nsBlockReflowState.h"
+
 #include "mozilla/DebugOnly.h"
 
 #include "nsBlockReflowContext.h"
-#include "nsBlockReflowState.h"
 #include "nsBlockFrame.h"
 #include "nsLineLayout.h"
 #include "nsPresContext.h"
@@ -354,6 +355,14 @@ nsBlockReflowState::SetupPushedFloatList()
   }
 }
 
+void
+nsBlockReflowState::AppendPushedFloat(nsIFrame* aFloatCont)
+{
+  SetupPushedFloatList();
+  aFloatCont->AddStateBits(NS_FRAME_IS_PUSHED_FLOAT);
+  mPushedFloats->AppendFrame(mBlock, aFloatCont);
+}
+
 /**
  * Restore information about floats into the float manager for an
  * incremental reflow, and simultaneously push the floats by

layout/generic/nsBlockReflowState.h

@@ -11,7 +11,10 @@
 #include "nsFloatManager.h"
 #include "nsLineBox.h"
 #include "nsFrameList.h"
-#include "nsBlockFrame.h"
+#include "nsHTMLReflowState.h"
+
+class nsBlockFrame;
+class nsOverflowContinuationTracker;
 
   // block reflow state flags
 #define BRS_UNCONSTRAINEDHEIGHT   0x00000001
@@ -188,11 +191,7 @@ public:
   // StealFrame. Call it before adding any frames to mPushedFloats.
   void SetupPushedFloatList();
   // Use this method to append to mPushedFloats.
-  void AppendPushedFloat(nsIFrame* aFloatCont) {
-    SetupPushedFloatList();
-    aFloatCont->AddStateBits(NS_FRAME_IS_PUSHED_FLOAT);
-    mPushedFloats->AppendFrame(mBlock, aFloatCont);
-  }
+  void AppendPushedFloat(nsIFrame* aFloatCont);
 
   // Track child overflow continuations.
   nsOverflowContinuationTracker* mOverflowTracker;

layout/generic/nsTextFrameThebes.cpp

@@ -5,6 +5,8 @@
 
 /* rendering object for textual content of elements */
 
+#include "nsTextFrame.h"
+
 #include <cmath> // for std::abs(float/double)
 #include <cstdlib> // for std::abs(int/long)
 
@@ -13,6 +15,7 @@
 #include "mozilla/Likely.h"
 
 #include "nsCOMPtr.h"
+#include "nsBlockFrame.h"
 #include "nsHTMLParts.h"
 #include "nsCRT.h"
 #include "nsSplittableFrame.h"
@@ -44,7 +47,6 @@
 #include "nsFrameManager.h"
 #include "nsTextFrameTextRunCache.h"
 #include "nsExpirationTracker.h"
-#include "nsTextFrame.h"
 #include "nsUnicodeProperties.h"
 #include "nsUnicharUtilCIID.h"