Use revised inline reflow status

layout/html/base/src/nsBRPart.cpp

@@ -131,8 +131,8 @@ BRFrame::InlineReflow(nsCSSLineLayout&      aLineLayout,
     breakType = NS_STYLE_CLEAR_LINE;
   }
 
-  return NS_INLINE_REFLOW_BREAK_AFTER |
+  return NS_INLINE_BREAK | NS_INLINE_BREAK_AFTER |
-    NS_INLINE_REFLOW_MAKE_BREAK_TYPE(breakType);
+    NS_INLINE_MAKE_BREAK_TYPE(breakType);
 }
 
 //----------------------------------------------------------------------

layout/html/base/src/nsHTMLBullet.cpp

@@ -619,7 +619,7 @@ BulletFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
     aMetrics.maxElementSize->width = aMetrics.width;
     aMetrics.maxElementSize->height = aMetrics.height;
   }
-  return NS_INLINE_REFLOW_COMPLETE;
+  return NS_FRAME_COMPLETE;
 }
 
 NS_IMETHODIMP

layout/html/base/src/nsSpacerPart.cpp

@@ -101,7 +101,7 @@ SpacerFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
                           nsReflowMetrics&     aMetrics,
                           const nsReflowState& aReflowState)
 {
-  nsresult rv = NS_INLINE_REFLOW_COMPLETE;
+  nsresult rv = NS_FRAME_COMPLETE;
 
   // By default, we have no area
   aMetrics.width = 0;
@@ -146,7 +146,7 @@ SpacerFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
 
   case TYPE_LINE:
     if (0 != width) {
-      rv = NS_INLINE_REFLOW_LINE_BREAK_AFTER;
+      rv = NS_INLINE_LINE_BREAK_AFTER(0);
       aMetrics.height = nscoord(width * p2t);
       aMetrics.ascent = aMetrics.height;
     }