Changed VerifyTree() to check that NS_FRAME_IN_REFLOW isn't set

layout/base/src/nsContainerFrame.cpp

@@ -1152,6 +1152,8 @@ NS_METHOD nsContainerFrame::ListTag(FILE* out) const
 NS_METHOD nsContainerFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
+
   // Check our child count
   PRInt32 len = LengthOf(mFirstChild);
   VERIFY_ASSERT(len == mChildCount, "bad child count");

layout/base/src/nsFrame.cpp

@@ -1323,6 +1323,7 @@ NS_METHOD nsFrame::ListTag(FILE* out) const
 
 NS_METHOD nsFrame::VerifyTree() const
 {
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   return NS_OK;
 }
 

layout/generic/nsBlockFrame.cpp

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/generic/nsBlockReflowState.cpp

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/generic/nsBlockReflowState.h

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/html/base/src/nsBlockFrame.cpp

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/html/base/src/nsBlockReflowState.cpp

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/html/base/src/nsBlockReflowState.h

@@ -336,6 +336,7 @@ NS_METHOD
 nsBlockFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
   nsresult rv = nsHTMLContainerFrame::VerifyTree();
   if (NS_OK != rv) {
     return rv;

layout/html/base/src/nsBodyFrame.cpp

@@ -238,6 +238,8 @@ NS_METHOD nsBodyFrame::Reflow(nsIPresContext*      aPresContext,
 NS_METHOD nsBodyFrame::VerifyTree() const
 {
 #ifdef NS_DEBUG
+  NS_ASSERTION(0 == (mState & NS_FRAME_IN_REFLOW), "frame is in reflow");
+
   // Check our child count
   PRInt32 len = LengthOf(mFirstChild);
   NS_ASSERTION(len == mChildCount, "bad child count");