continuing work on bug 25510

r=troy

layout/generic/nsBlockFrame.cpp

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty

layout/generic/nsBlockReflowState.cpp

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty

layout/generic/nsBlockReflowState.h

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty

layout/html/base/src/nsBlockFrame.cpp

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty

layout/html/base/src/nsBlockReflowState.cpp

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty

layout/html/base/src/nsBlockReflowState.h

@@ -1528,6 +1528,8 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
       nsLineBox* prevLine; 
       nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater); 
       if (line && (PR_FALSE==line->IsBlock())) 
+      { 
+        if (!isFloater) // punt if isFloater!  
         {
           nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics, 
                                        NS_BLOCK_MARGIN_ROOT & mState); 
@@ -1536,6 +1538,7 @@ nsBlockFrame::Reflow(nsIPresContext*          aPresContext,
           rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE); 
           state.mNextRCFrame = nsnull; 
         } 
+      }
       // XXX To Do: we need to check some metrics here to see if anything changed
       // if nothing changed, we're done
       // otherwise, we should mark the line and the previous line both dirty