Bug 775624 Part 22 - Remove NS_FRAME_COMPLETE. r=dholbert

This patch is written by the following script with some manual adjustment to the comment in nsRubyTextContainerFrame.cpp and nsRubyFrame.cpp, and nsColumnSetFrame's constructor. function rename() { find layout\ -type f\ $ -name "*.cpp" -or\ -name "*.h" $\ -exec sed -i -r "s/$1/$2/g" "{}" \; } rename "nsReflowStatus *([a-zA-Z0-9]*) = NS_FRAME_COMPLETE" "nsReflowStatus \1" rename "([a-zA-Z0-9.*]*) *= NS_FRAME_COMPLETE;" "\1.Reset();" rename "([a-zA-Z0-9.*]*) == NS_FRAME_COMPLETE" "\1.IsEmpty()" MozReview-Commit-ID: 9tqQAHvdQex --HG-- extra : rebase_source : 3119776946dc2c8350098b7bf9f3ceff29bdffb5
2017-02-14 17:55:48 +08:00 · 2017-02-14 17:55:48 +08:00 · 8f840dc923
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@ -9217,7 +9217,7 @@ PresShell::DoReflow(nsIFrame* target, bool aInterruptible)
  NS_ASSERTION(target == rootFrame ||
               desiredSize.ScrollableOverflow().IsEqualEdges(boundsRelativeToTarget),
               "non-root reflow roots must not have scrollable overflow");
-  NS_ASSERTION(status == NS_FRAME_COMPLETE,
+  NS_ASSERTION(status.IsEmpty(),
               "reflow roots should never split");

  target->SetSize(boundsRelativeToTarget.Size());
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@ -901,7 +901,7 @@ nsComboboxControlFrame::Reflow(nsPresContext*          aPresContext,
      !aStatus.IsFullyComplete()) {
    // This frame didn't fit inside a fragmentation container.  Splitting
    // a nsComboboxControlFrame makes no sense, so we override the status here.
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
  }
 }

@ -1328,7 +1328,7 @@ nsComboboxDisplayFrame::Reflow(nsPresContext*           aPresContext,
  }
  state.SetComputedISize(computedISize);
  nsBlockFrame::Reflow(aPresContext, aDesiredSize, state, aStatus);
-  aStatus = NS_FRAME_COMPLETE; // this type of frame can't be split
+  aStatus.Reset(); // this type of frame can't be split
 }

 void
--- a/layout/forms/nsDateTimeControlFrame.cpp
+++ b/layout/forms/nsDateTimeControlFrame.cpp
@ -293,7 +293,7 @@ nsDateTimeControlFrame::Reflow(nsPresContext* aPresContext,

  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
                 ("exit nsDateTimeControlFrame::Reflow: size=%d,%d",
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@ -339,10 +339,10 @@ nsFieldSetFrame::Reflow(nsPresContext*           aPresContext,
                  "Should have a precomputed inline-size!");

  // Initialize OUT parameter
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  nsOverflowAreas ocBounds;
-  nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus ocStatus;
  if (GetPrevInFlow()) {
    ReflowOverflowContainerChildren(aPresContext, aReflowInput, ocBounds, 0,
                                    ocStatus);
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@ -131,7 +131,7 @@ nsFormControlFrame::Reflow(nsPresContext*          aPresContext,
    RegUnRegAccessKey(static_cast<nsIFrame*>(this), true);
  }

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  aDesiredSize.SetSize(aReflowInput.GetWritingMode(),
                       aReflowInput.ComputedSizeWithBorderPadding());

--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@ -214,13 +214,13 @@ nsHTMLButtonControlFrame::Reflow(nsPresContext* aPresContext,
  // else, we ignore child overflow -- anything that overflows beyond our
  // own border-box will get clipped when painting.

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize,
                                 aReflowInput, aStatus);

  // We're always complete and we don't support overflow containers
  // so we shouldn't have a next-in-flow ever.
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  MOZ_ASSERT(!GetNextInFlow());

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
--- a/layout/forms/nsMeterFrame.cpp
+++ b/layout/forms/nsMeterFrame.cpp
@ -128,7 +128,7 @@ nsMeterFrame::Reflow(nsPresContext*           aPresContext,
  ConsiderChildOverflow(aDesiredSize.mOverflowAreas, barFrame);
  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }
--- a/layout/forms/nsNumberControlFrame.cpp
+++ b/layout/forms/nsNumberControlFrame.cpp
@ -242,7 +242,7 @@ nsNumberControlFrame::Reflow(nsPresContext* aPresContext,

  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@ -137,7 +137,7 @@ nsProgressFrame::Reflow(nsPresContext*           aPresContext,

  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }
--- a/layout/forms/nsRangeFrame.cpp
+++ b/layout/forms/nsRangeFrame.cpp
@ -363,7 +363,7 @@ nsRangeFrame::Reflow(nsPresContext*           aPresContext,

  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@ -541,7 +541,7 @@ nsTextControlFrame::Reflow(nsPresContext*   aPresContext,
  // take into account css properties that affect overflow handling
  FinishAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/generic/BRFrame.cpp
+++ b/layout/generic/BRFrame.cpp
@ -159,7 +159,7 @@ BRFrame::Reflow(nsPresContext* aPresContext,
    ll->SetLineEndsInBR(true);
  }
  else {
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
  }

  aMetrics.SetSize(wm, finalSize);
--- a/layout/generic/BlockReflowInput.cpp
+++ b/layout/generic/BlockReflowInput.cpp
@ -104,7 +104,7 @@ BlockReflowInput::BlockReflowInput(const ReflowInput& aReflowInput,
  FloatManager()->GetTranslation(mFloatManagerI, mFloatManagerB);
  FloatManager()->PushState(&mFloatManagerStateBefore); // never popped

-  mReflowStatus = NS_FRAME_COMPLETE;
+  mReflowStatus.Reset();

  mNextInFlow = static_cast<nsBlockFrame*>(mBlock->GetNextInFlow());

--- a/layout/generic/ViewportFrame.cpp
+++ b/layout/generic/ViewportFrame.cpp
@ -290,7 +290,7 @@ ViewportFrame::Reflow(nsPresContext*           aPresContext,
  NS_FRAME_TRACE_REFLOW_IN("ViewportFrame::Reflow");

  // Initialize OUT parameters
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // Because |Reflow| sets ComputedBSize() on the child to our
  // ComputedBSize().
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@ -119,7 +119,7 @@ nsAbsoluteContainingBlock::Reflow(nsContainerFrame*        aDelegatingFrame,
                                  AbsPosReflowFlags        aFlags,
                                  nsOverflowAreas*         aOverflowAreas)
 {
-  nsReflowStatus reflowStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus reflowStatus;

  const bool reflowAll = aReflowInput.ShouldReflowAllKids();
  const bool isGrid = !!(aFlags & AbsPosReflowFlags::eIsGridContainerCB);
@ -132,7 +132,7 @@ nsAbsoluteContainingBlock::Reflow(nsContainerFrame*        aDelegatingFrame,
                              !!(aFlags & AbsPosReflowFlags::eCBHeightChanged));
    if (kidNeedsReflow && !aPresContext->HasPendingInterrupt()) {
      // Reflow the frame
-      nsReflowStatus  kidStatus = NS_FRAME_COMPLETE;
+      nsReflowStatus kidStatus;
      const nsRect& cb = isGrid ? nsGridContainerFrame::GridItemCB(kidFrame)
                                : aContainingBlock;
      ReflowAbsoluteFrame(aDelegatingFrame, aPresContext, aReflowInput, cb,
--- a/layout/generic/nsBackdropFrame.cpp
+++ b/layout/generic/nsBackdropFrame.cpp
@ -92,5 +92,5 @@ nsBackdropFrame::Reflow(nsPresContext* aPresContext,
  nscoord isize = aReflowInput.ComputedISize() + borderPadding.IStartEnd(wm);
  nscoord bsize = aReflowInput.ComputedBSize() + borderPadding.BStartEnd(wm);
  aDesiredSize.SetSize(wm, LogicalSize(wm, isize, bsize));
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
 }
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@ -1195,7 +1195,7 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,

  // Handle paginated overflow (see nsContainerFrame.h)
  nsOverflowAreas ocBounds;
-  nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus ocStatus;
  if (GetPrevInFlow()) {
    ReflowOverflowContainerChildren(aPresContext, *reflowInput, ocBounds, 0,
                                    ocStatus);
@ -1209,7 +1209,7 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
  // Drain & handle pushed floats
  DrainPushedFloats();
  nsOverflowAreas fcBounds;
-  nsReflowStatus fcStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus fcStatus;
  ReflowPushedFloats(state, fcBounds, fcStatus);

  // If we're not dirty (which means we'll mark everything dirty later)
@ -3458,7 +3458,7 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
          aState.mReflowInput.mDiscoveredClearance;
      }

-      frameReflowStatus = NS_FRAME_COMPLETE;
+      frameReflowStatus.Reset();
      brc.ReflowBlock(availSpace, applyBStartMargin, aState.mPrevBEndMargin,
                      clearance, aState.IsAdjacentWithTop(),
                      aLine.get(), *blockHtmlRI, frameReflowStatus, aState);
@ -6215,7 +6215,7 @@ nsBlockFrame::ReflowFloat(BlockReflowInput& aState,
  NS_PRECONDITION(aFloat->GetStateBits() & NS_FRAME_OUT_OF_FLOW,
                  "aFloat must be an out-of-flow frame");
  // Reflow the float.
-  aReflowStatus = NS_FRAME_COMPLETE;
+  aReflowStatus.Reset();

  WritingMode wm = aState.mReflowInput.GetWritingMode();
 #ifdef NOISY_FLOAT
@ -6282,7 +6282,7 @@ nsBlockFrame::ReflowFloat(BlockReflowInput& aState,
             (NS_UNCONSTRAINEDSIZE == aAdjustedAvailableSpace.BSize(wm))) {
    // An incomplete reflow status means we should split the float
    // if the height is constrained (bug 145305).
-    aReflowStatus = NS_FRAME_COMPLETE;
+    aReflowStatus.Reset();
  }

  if (aReflowStatus.NextInFlowNeedsReflow()) {
@ -6294,7 +6294,7 @@ nsBlockFrame::ReflowFloat(BlockReflowInput& aState,
    // such frames simply means that there is more content to be
    // reflowed on the line.
    if (aReflowStatus.IsIncomplete())
-      aReflowStatus = NS_FRAME_COMPLETE;
+      aReflowStatus.Reset();
  }

  // Capture the margin and offsets information for the caller
--- a/layout/generic/nsBulletFrame.cpp
+++ b/layout/generic/nsBulletFrame.cpp
@ -1063,7 +1063,7 @@ nsBulletFrame::Reflow(nsPresContext* aPresContext,
  // 397294).
  aMetrics.SetOverflowAreasToDesiredBounds();

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aMetrics);
 }

--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@ -649,7 +649,7 @@ nsCanvasFrame::Reflow(nsPresContext*           aPresContext,
  NS_FRAME_TRACE_REFLOW_IN("nsCanvasFrame::Reflow");

  // Initialize OUT parameter
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  nsCanvasFrame* prevCanvasFrame = static_cast<nsCanvasFrame*>
                                               (GetPrevInFlow());
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@ -32,8 +32,8 @@ NS_NewColumnSetFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, nsFrame
 NS_IMPL_FRAMEARENA_HELPERS(nsColumnSetFrame)

 nsColumnSetFrame::nsColumnSetFrame(nsStyleContext* aContext)
-  : nsContainerFrame(aContext), mLastBalanceBSize(NS_INTRINSICSIZE),
-    mLastFrameStatus(NS_FRAME_COMPLETE)
+  : nsContainerFrame(aContext)
+  , mLastBalanceBSize(NS_INTRINSICSIZE)
 {
 }

@ -1036,7 +1036,7 @@ nsColumnSetFrame::Reflow(nsPresContext*           aPresContext,
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);

  // Initialize OUT parameter
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // Our children depend on our block-size if we have a fixed block-size.
  if (aReflowInput.ComputedBSize() != NS_AUTOHEIGHT) {
@ -1057,7 +1057,7 @@ nsColumnSetFrame::Reflow(nsPresContext*           aPresContext,
 #endif

  nsOverflowAreas ocBounds;
-  nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus ocStatus;
  if (GetPrevInFlow()) {
    ReflowOverflowContainerChildren(aPresContext, aReflowInput, ocBounds, 0,
                                    ocStatus);
@ -1102,7 +1102,7 @@ nsColumnSetFrame::Reflow(nsPresContext*           aPresContext,
      aReflowInput.AvailableBSize() == NS_UNCONSTRAINEDSIZE) {
    // In this situation, we might be lying about our reflow status, because
    // our last kid (the one that got interrupted) was incomplete.  Fix that.
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
  }

  NS_ASSERTION(aStatus.IsFullyComplete() ||
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@ -4329,7 +4329,7 @@ nsFlexContainerFrame::DoFlexLayout(nsPresContext*           aPresContext,
                                   nsTArray<StrutInfo>& aStruts,
                                   const FlexboxAxisTracker& aAxisTracker)
 {
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  LinkedList<FlexLine> lines;
  nsTArray<nsIFrame*> placeholderKids;
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@ -5724,7 +5724,7 @@ nsFrame::Reflow(nsPresContext*          aPresContext,
  MarkInReflow();
  DO_GLOBAL_REFLOW_COUNT("nsFrame");
  aDesiredSize.ClearSize();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

@ -9740,7 +9740,7 @@ nsFrame::DoXULLayout(nsBoxLayoutState& aState)
    AddStateBits(NS_FRAME_IN_REFLOW);
    // Set up a |reflowStatus| to pass into ReflowAbsoluteFrames
    // (just a dummy value; hopefully that's OK)
-    nsReflowStatus reflowStatus = NS_FRAME_COMPLETE;
+    nsReflowStatus reflowStatus;
    ReflowAbsoluteFrames(aState.PresContext(), desiredSize,
                         reflowInput, reflowStatus);
    RemoveStateBits(NS_FRAME_IN_REFLOW);
@ -9777,7 +9777,7 @@ nsFrame::BoxReflow(nsBoxLayoutState&        aState,
 #endif

  nsBoxLayoutMetrics *metrics = BoxMetrics();
-  nsReflowStatus status = NS_FRAME_COMPLETE;
+  nsReflowStatus status;
  WritingMode wm = aDesiredSize.GetWritingMode();

  bool needsReflow = NS_SUBTREE_DIRTY(this);
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@ -849,7 +849,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*           aPresContext,
  // If the number of cols or rows has changed, the frame for the frameset
  // will be re-created.
  if (mNumRows != rows || mNumCols != cols) {
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    mDrag.UnSet();
    NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
    return;
@ -1084,7 +1084,7 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*           aPresContext,
    mChildBorderColors.reset();
  }

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  mDrag.UnSet();

  aDesiredSize.SetOverflowAreasToDesiredBounds();
@ -1394,7 +1394,7 @@ nsHTMLFramesetBorderFrame::Reflow(nsPresContext*           aPresContext,
  SizeToAvailSize(aReflowInput, aDesiredSize);

  aDesiredSize.SetOverflowAreasToDesiredBounds();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
 }

 class nsDisplayFramesetBorder : public nsDisplayItem {
@ -1609,7 +1609,7 @@ nsHTMLFramesetBlankFrame::Reflow(nsPresContext*           aPresContext,
  SizeToAvailSize(aReflowInput, aDesiredSize);

  aDesiredSize.SetOverflowAreasToDesiredBounds();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
 }

 class nsDisplayFramesetBlank : public nsDisplayItem {
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@ -1106,7 +1106,7 @@ nsHTMLScrollFrame::Reflow(nsPresContext*           aPresContext,

  mHelper.UpdatePrevScrolledRect();

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
  mHelper.PostOverflowEvent();
 }
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@ -5321,7 +5321,7 @@ nsGridContainerFrame::ReflowInFragmentainer(GridReflowInput&     aState,
                                            Fragmentainer&       aFragmentainer,
                                            const nsSize&        aContainerSize)
 {
-  MOZ_ASSERT(aStatus == NS_FRAME_COMPLETE);
+  MOZ_ASSERT(aStatus.IsEmpty());
  MOZ_ASSERT(aState.mReflowInput);

  // Collect our grid items and sort them in row order.  Collect placeholders
@ -5397,7 +5397,7 @@ nsGridContainerFrame::ReflowInFragmentainer(GridReflowInput&     aState,
        endRow = itemStartRow;
        isForcedBreak = true;
        // reset any BREAK_AFTER we found on an earlier item
-        aStatus = NS_FRAME_COMPLETE;
+        aStatus.Reset();
        break;  // we're done since the items are sorted in row order
      }
    }
@ -5674,7 +5674,7 @@ nsGridContainerFrame::ReflowRowsInFragmentainer(
          continue;
        }
        NS_ERROR("got BREAK_BEFORE at top-of-page");
-        childStatus = NS_FRAME_COMPLETE;
+        childStatus.Reset();
      } else {
        NS_ERROR("got BREAK_BEFORE again after growing the row?");
        childStatus.SetIncomplete();
@ -5824,9 +5824,9 @@ nsGridContainerFrame::ReflowChildren(GridReflowInput&     aState,
 {
  MOZ_ASSERT(aState.mReflowInput);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  nsOverflowAreas ocBounds;
-  nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus ocStatus;
  if (GetPrevInFlow()) {
    ReflowOverflowContainerChildren(PresContext(), *aState.mReflowInput,
                                    ocBounds, 0, ocStatus,
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@ -257,7 +257,7 @@ nsHTMLCanvasFrame::Reflow(nsPresContext*           aPresContext,

  NS_PRECONDITION(mState & NS_FRAME_IN_REFLOW, "frame is not in reflow");

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  WritingMode wm = aReflowInput.GetWritingMode();
  LogicalSize finalSize(wm,
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@ -261,6 +261,17 @@ public:
    return !(*this == aRhs);
  }

+  // Return true if all flags are cleared.
+  bool IsEmpty() const {
+    return (!mIncomplete &&
+            !mOverflowIncomplete &&
+            !mNextInFlowNeedsReflow &&
+            !mTruncated &&
+            !mInlineBreak &&
+            !mInlineBreakAfter &&
+            !mFirstLetterComplete);
+  }
+
  // mIncomplete bit flag means the frame does not map all its content, and
  // that the parent frame should create a continuing frame. If this bit
  // isn't set, it means the frame does map all its content. This bit is
@ -369,8 +380,6 @@ private:
  bool mFirstLetterComplete : 1;
 };

-#define NS_FRAME_COMPLETE             0       // Note: not a bit!
-
 #define NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aMetrics) \
  aStatus.UpdateTruncated(aReflowInput, aMetrics);

--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@ -959,7 +959,7 @@ nsImageFrame::Reflow(nsPresContext*          aPresContext,

  NS_PRECONDITION(mState & NS_FRAME_IN_REFLOW, "frame is not in reflow");

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // see if we have a frozen size (i.e. a fixed width and height)
  if (HaveFixedSize(aReflowInput)) {
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@ -574,7 +574,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
                            ReflowOutput& aMetrics,
                            nsReflowStatus& aStatus)
 {
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  nsLineLayout* lineLayout = aReflowInput.mLineLayout;
  bool inFirstLine = aReflowInput.mLineLayout->GetInFirstLine();
--- a/layout/generic/nsLeafFrame.cpp
+++ b/layout/generic/nsLeafFrame.cpp
@ -85,7 +85,7 @@ nsLeafFrame::DoReflow(nsPresContext* aPresContext,
  WritingMode wm = aReflowInput.GetWritingMode();
  aMetrics.SetSize(wm, aReflowInput.ComputedSizeWithBorderPadding());

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
                 ("exit nsLeafFrame::DoReflow: size=%d,%d",
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@ -28,7 +28,7 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
  MarkInReflow();
  DO_GLOBAL_REFLOW_COUNT("nsPageContentFrame");
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);
-  aStatus = NS_FRAME_COMPLETE;  // initialize out parameter
+  aStatus.Reset();  // initialize out parameter

  if (GetPrevInFlow() && (GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
    nsresult rv = aPresContext->PresShell()->FrameConstructor()
@ -93,7 +93,7 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
  }

  // Reflow our fixed frames
-  nsReflowStatus fixedStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus fixedStatus;
  ReflowAbsoluteFrames(aPresContext, aDesiredSize, aReflowInput, fixedStatus);
  NS_ASSERTION(fixedStatus.IsComplete(), "fixed frames can be truncated, but not incomplete");

--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@ -58,7 +58,7 @@ nsPageFrame::Reflow(nsPresContext*           aPresContext,
  MarkInReflow();
  DO_GLOBAL_REFLOW_COUNT("nsPageFrame");
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);
-  aStatus = NS_FRAME_COMPLETE;  // initialize out parameter
+  aStatus.Reset();  // initialize out parameter

  NS_ASSERTION(mFrames.FirstChild() &&
               nsGkAtoms::pageContentFrame == mFrames.FirstChild()->GetType(),
@ -731,7 +731,7 @@ nsPageBreakFrame::Reflow(nsPresContext*           aPresContext,
  // Note: not using NS_FRAME_FIRST_REFLOW here, since it's not clear whether
  // DidReflow will always get called before the next Reflow() call.
  mHaveReflowed = true;
-  aStatus = NS_FRAME_COMPLETE; 
+  aStatus.Reset(); 
 }

 nsIAtom*
--- a/layout/generic/nsPlaceholderFrame.cpp
+++ b/layout/generic/nsPlaceholderFrame.cpp
@ -147,7 +147,7 @@ nsPlaceholderFrame::Reflow(nsPresContext*           aPresContext,
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);
  aDesiredSize.ClearSize();

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/generic/nsPluginFrame.cpp
+++ b/layout/generic/nsPluginFrame.cpp
@ -506,13 +506,13 @@ nsPluginFrame::Reflow(nsPresContext*           aPresContext,
  // arrived. Otherwise there may be PARAMs or other stuff that the
  // plugin needs to see that haven't arrived yet.
  if (!GetContent()->IsDoneAddingChildren()) {
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

  // if we are printing or print previewing, bail for now
  if (aPresContext->Medium() == nsGkAtoms::print) {
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

@ -531,7 +531,7 @@ nsPluginFrame::Reflow(nsPresContext*           aPresContext,
    aPresContext->PresShell()->PostReflowCallback(this);
  }

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aMetrics);
 }
--- a/layout/generic/nsRubyBaseContainerFrame.cpp
+++ b/layout/generic/nsRubyBaseContainerFrame.cpp
@ -307,7 +307,7 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
  MarkInReflow();
  DO_GLOBAL_REFLOW_COUNT("nsRubyBaseContainerFrame");
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  if (!aReflowInput.mLineLayout) {
    NS_ASSERTION(
@ -470,8 +470,8 @@ nsRubyBaseContainerFrame::ReflowColumns(const RubyReflowInput& aReflowInput,
  const uint32_t rtcCount = aReflowInput.mTextContainers.Length();
  nscoord icoord = lineLayout->GetCurrentICoord();
  MOZ_ASSERT(icoord == 0, "border/padding of rbc should have been suppressed");
-  nsReflowStatus reflowStatus = NS_FRAME_COMPLETE;
-  aStatus = NS_FRAME_COMPLETE;
+  nsReflowStatus reflowStatus;
+  aStatus.Reset();

  uint32_t columnIndex = 0;
  RubyColumn column;
@ -487,14 +487,14 @@ nsRubyBaseContainerFrame::ReflowColumns(const RubyReflowInput& aReflowInput,
      break;
    }
    // We are not handling overflow here.
-    MOZ_ASSERT(reflowStatus == NS_FRAME_COMPLETE);
+    MOZ_ASSERT(reflowStatus.IsEmpty());
  }

  bool isComplete = false;
  PullFrameState pullFrameState(this, aReflowInput.mTextContainers);
  while (!reflowStatus.IsInlineBreak()) {
    // We are not handling overflow here.
-    MOZ_ASSERT(reflowStatus == NS_FRAME_COMPLETE);
+    MOZ_ASSERT(reflowStatus.IsEmpty());

    // Try pull some frames from next continuations. This call replaces
    // frames in |column| with the frame pulled in each level.
--- a/layout/generic/nsRubyFrame.cpp
+++ b/layout/generic/nsRubyFrame.cpp
@ -116,7 +116,7 @@ nsRubyFrame::Reflow(nsPresContext* aPresContext,
  if (!aReflowInput.mLineLayout) {
    NS_ASSERTION(aReflowInput.mLineLayout,
                 "No line layout provided to RubyFrame reflow method.");
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

@ -143,7 +143,7 @@ nsRubyFrame::Reflow(nsPresContext* aPresContext,
  aReflowInput.mLineLayout->BeginSpan(this, &aReflowInput,
                                      startEdge, availableISize, &mBaseline);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  for (RubySegmentEnumerator e(this); !e.AtEnd(); e.Next()) {
    ReflowSegment(aPresContext, aReflowInput, e.GetBaseContainer(), aStatus);

@ -155,7 +155,7 @@ nsRubyFrame::Reflow(nsPresContext* aPresContext,
  }

  ContinuationTraversingState pullState(this);
-  while (aStatus == NS_FRAME_COMPLETE) {
+  while (aStatus.IsEmpty()) {
    nsRubyBaseContainerFrame* baseContainer =
      PullOneSegment(aReflowInput.mLineLayout, pullState);
    if (!baseContainer) {
@ -305,10 +305,10 @@ nsRubyFrame::ReflowSegment(nsPresContext* aPresContext,
    textReflowInput.mLineLayout = aReflowInput.mLineLayout;
    textContainer->Reflow(aPresContext, textMetrics,
                          textReflowInput, textReflowStatus);
-    // Ruby text containers always return NS_FRAME_COMPLETE even when
+    // Ruby text containers always return complete reflow status even when
    // they have continuations, because the breaking has already been
    // handled when reflowing the base containers.
-    NS_ASSERTION(textReflowStatus == NS_FRAME_COMPLETE,
+    NS_ASSERTION(textReflowStatus.IsEmpty(),
                 "Ruby text container must not break itself inside");
    // The metrics is initialized with reflow state of this ruby frame,
    // hence the writing-mode is tied to rubyWM instead of rtcWM.
--- a/layout/generic/nsRubyTextContainerFrame.cpp
+++ b/layout/generic/nsRubyTextContainerFrame.cpp
@ -130,10 +130,10 @@ nsRubyTextContainerFrame::Reflow(nsPresContext* aPresContext,
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);

  // Although a ruby text container may have continuations, returning
-  // NS_FRAME_COMPLETE here is still safe, since its parent, ruby frame,
+  // complete reflow status is still safe, since its parent, ruby frame,
  // ignores the status, and continuations of the ruby base container
  // will take care of our continuations.
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  WritingMode lineWM = aReflowInput.mLineLayout->GetWritingMode();

  nscoord minBCoord = nscoord_MAX;
--- a/layout/generic/nsSimplePageSequenceFrame.cpp
+++ b/layout/generic/nsSimplePageSequenceFrame.cpp
@ -156,7 +156,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*     aPresContext,
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);
  NS_FRAME_TRACE_REFLOW_IN("nsSimplePageSequenceFrame::Reflow");

-  aStatus = NS_FRAME_COMPLETE;  // we're always complete
+  aStatus.Reset();  // we're always complete

  // Don't do incremental reflow until we've taught tables how to do
  // it right in paginated mode.
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@ -752,7 +752,7 @@ nsSubDocumentFrame::Reflow(nsPresContext*           aPresContext,
               "Shouldn't have unconstrained stuff here "
               "thanks to ComputeAutoSize");

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  NS_ASSERTION(mContent->GetPrimaryFrame() == this,
               "Shouldn't happen");
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@ -8984,7 +8984,7 @@ nsTextFrame::Reflow(nsPresContext*           aPresContext,
  // but not inside a cell. For now, just don't reflow.
  if (!aReflowInput.mLineLayout) {
    ClearMetrics(aMetrics);
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

@ -9060,7 +9060,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
  // We don't need to reflow if there is no content.
  if (!maxContentLength) {
    ClearMetrics(aMetrics);
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

@ -9217,7 +9217,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,

  if (!mTextRun) {
    ClearMetrics(aMetrics);
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    return;
  }

--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@ -296,7 +296,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext,

  NS_PRECONDITION(mState & NS_FRAME_IN_REFLOW, "frame is not in reflow");

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  const WritingMode myWM = aReflowInput.GetWritingMode();
  nscoord contentBoxBSize = aReflowInput.ComputedBSize();
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@ -950,7 +950,7 @@ nsMathMLContainerFrame::Reflow(nsPresContext*           aPresContext,
  // Place children now by re-adjusting the origins to align the baselines
  FinalizeReflow(drawTarget, aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/mathml/nsMathMLSelectedFrame.cpp
+++ b/layout/mathml/nsMathMLSelectedFrame.cpp
@ -140,7 +140,7 @@ nsMathMLSelectedFrame::Reflow(nsPresContext*          aPresContext,
 {
  MarkInReflow();
  mPresentationData.flags &= ~NS_MATHML_ERROR;
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  aDesiredSize.ClearSize();
  aDesiredSize.SetBlockStartAscent(0);
  mBoundingMetrics = nsBoundingMetrics();
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@ -152,7 +152,7 @@ nsMathMLTokenFrame::Reflow(nsPresContext*          aPresContext,
  // place and size children
  FinalizeReflow(aReflowInput.mRenderingContext->GetDrawTarget(), aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/mathml/nsMathMLmfencedFrame.cpp
+++ b/layout/mathml/nsMathMLmfencedFrame.cpp
@ -446,7 +446,7 @@ nsMathMLmfencedFrame::Reflow(nsPresContext*          aPresContext,
  // Set our overflow area
  GatherAndStoreOverflow(&aDesiredSize);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/mathml/nsMathMLmrootFrame.cpp
+++ b/layout/mathml/nsMathMLmrootFrame.cpp
@ -216,7 +216,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
    // report an error, encourage people to get their markups in order
    ReportChildCountError();
    ReflowError(drawTarget, aDesiredSize);
-    aStatus = NS_FRAME_COMPLETE;
+    aStatus.Reset();
    NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
    // Call DidReflow() for the child frames we successfully did reflow.
    DidReflowChildren(mFrames.FirstChild(), childFrame);
@ -354,7 +354,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext*          aPresContext,
  mReference.x = 0;
  mReference.y = aDesiredSize.BlockStartAscent();

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/mathml/nsMathMLmspaceFrame.cpp
+++ b/layout/mathml/nsMathMLmspaceFrame.cpp
@ -115,7 +115,7 @@ nsMathMLmspaceFrame::Reflow(nsPresContext*          aPresContext,
  // Also return our bounding metrics
  aDesiredSize.mBoundingMetrics = mBoundingMetrics;

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/svg/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/nsSVGForeignObjectFrame.cpp
@ -158,7 +158,7 @@ nsSVGForeignObjectFrame::Reflow(nsPresContext*           aPresContext,
                        aReflowInput.ComputedBSize());
  aDesiredSize.SetSize(wm, finalSize);
  aDesiredSize.SetOverflowAreasToDesiredBounds();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
 }

 void
--- a/layout/svg/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/nsSVGOuterSVGFrame.cpp
@ -369,7 +369,7 @@ nsSVGOuterSVGFrame::Reflow(nsPresContext*           aPresContext,

  NS_PRECONDITION(mState & NS_FRAME_IN_REFLOW, "frame is not in reflow");

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  aDesiredSize.Width()  = aReflowInput.ComputedWidth() +
                          aReflowInput.ComputedPhysicalBorderPadding().LeftRight();
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@ -876,7 +876,7 @@ nsTableCellFrame::Reflow(nsPresContext*           aPresContext,
  // see if a special bsize reflow needs to occur due to having a pct height
  nsTableFrame::CheckRequestSpecialBSizeReflow(aReflowInput);

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  WritingMode wm = aReflowInput.GetWritingMode();
  LogicalSize availSize(wm, aReflowInput.AvailableISize(),
                            aReflowInput.AvailableBSize());
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@ -118,7 +118,7 @@ nsTableColFrame::Reflow(nsPresContext*          aPresContext,
  if (collapseCol) {
    GetTableFrame()->SetNeedToCollapse(true);
  }
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@ -379,7 +379,7 @@ nsTableColGroupFrame::Reflow(nsPresContext*          aPresContext,
  }

  aDesiredSize.ClearSize();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
 }

--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@ -1844,7 +1844,7 @@ nsTableFrame::Reflow(nsPresContext*           aPresContext,
  bool isPaginated = aPresContext->IsPaginated();
  WritingMode wm = aReflowInput.GetWritingMode();

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  if (!GetPrevInFlow() && !mTableLayoutStrategy) {
    NS_ERROR("strategy should have been created in Init");
    return;
@ -2047,7 +2047,7 @@ nsTableFrame::FixupPositionedTableParts(nsPresContext*           aPresContext,
    ReflowInput reflowInput(aPresContext, positionedPart,
                                  aReflowInput.mRenderingContext, availSize,
                                  ReflowInput::DUMMY_PARENT_REFLOW_STATE);
-    nsReflowStatus reflowStatus = NS_FRAME_COMPLETE;
+    nsReflowStatus reflowStatus;

    // Reflow absolutely-positioned descendants of the positioned part.
    // FIXME: Unconditionally using NS_UNCONSTRAINEDSIZE for the bsize and
@ -3022,7 +3022,7 @@ nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput,
                             nsIFrame*&          aLastChildReflowed,
                             nsOverflowAreas&    aOverflowAreas)
 {
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();
  aLastChildReflowed = nullptr;

  nsIFrame* prevKidFrame = nullptr;
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@ -803,7 +803,7 @@ nsTableRowFrame::ReflowChildren(nsPresContext*           aPresContext,
                                nsTableFrame&            aTableFrame,
                                nsReflowStatus&          aStatus)
 {
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // XXXldb Should we be checking constrained bsize instead?
  const bool isPaginated = aPresContext->IsPaginated();
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@ -1256,7 +1256,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsPresContext*           aPresContext,
        else {
          // We can't push children, so let our parent reflow us again with more space
          aDesiredSize.Height() = rowRect.YMost();
-          aStatus = NS_FRAME_COMPLETE;
+          aStatus.Reset();
          break;
        }
      }
@ -1276,7 +1276,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsPresContext*           aPresContext,
          else {
            // We can't push children, so let our parent reflow us again with more space
            aDesiredSize.Height() = rowRect.YMost();
-            aStatus = NS_FRAME_COMPLETE;
+            aStatus.Reset();
            UndoContinuedRow(aPresContext, contRow);
            contRow = nullptr;
          }
@ -1313,7 +1313,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsPresContext*           aPresContext,
            else {
              // Let our parent reflow us again with more space
              aDesiredSize.Height() = rowRect.YMost();
-              aStatus = NS_FRAME_COMPLETE;
+              aStatus.Reset();
              UndoContinuedRow(aPresContext, contRow);
              contRow = nullptr;
            }
@ -1368,7 +1368,7 @@ nsTableRowGroupFrame::Reflow(nsPresContext*           aPresContext,
  DO_GLOBAL_REFLOW_COUNT("nsTableRowGroupFrame");
  DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus);

-  aStatus     = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // Row geometry may be going to change so we need to invalidate any row cursor.
  ClearRowCursor();
--- a/layout/tables/nsTableWrapperFrame.cpp
+++ b/layout/tables/nsTableWrapperFrame.cpp
@ -855,7 +855,7 @@ nsTableWrapperFrame::Reflow(nsPresContext*           aPresContext,

  // Initialize out parameters
  aDesiredSize.ClearSize();
-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  if (!HasAnyStateBits(NS_FRAME_FIRST_REFLOW)) {
    // Set up our kids.  They're already present, on an overflow list,
--- a/layout/xul/nsBoxFrame.cpp
+++ b/layout/xul/nsBoxFrame.cpp
@ -658,7 +658,7 @@ nsBoxFrame::Reflow(nsPresContext*          aPresContext,

 #endif

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // create the layout state
  nsBoxLayoutState state(aPresContext, aReflowInput.mRenderingContext,
@ -944,7 +944,7 @@ nsBoxFrame::DoXULLayout(nsBoxLayoutState& aState)
    AddStateBits(NS_FRAME_IN_REFLOW);
    // Set up a |reflowStatus| to pass into ReflowAbsoluteFrames
    // (just a dummy value; hopefully that's OK)
-    nsReflowStatus reflowStatus = NS_FRAME_COMPLETE;
+    nsReflowStatus reflowStatus;
    ReflowAbsoluteFrames(aState.PresContext(), desiredSize,
                         reflowInput, reflowStatus);
    RemoveStateBits(NS_FRAME_IN_REFLOW);
--- a/layout/xul/nsLeafBoxFrame.cpp
+++ b/layout/xul/nsLeafBoxFrame.cpp
@ -235,7 +235,7 @@ nsLeafBoxFrame::Reflow(nsPresContext*   aPresContext,

 #endif

-  aStatus = NS_FRAME_COMPLETE;
+  aStatus.Reset();

  // create the layout state
  nsBoxLayoutState state(aPresContext, aReflowInput.mRenderingContext);