From 3247d10b9ef87ec5d38c2b12505205d958e4f459 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Thu, 14 Mar 2013 14:39:26 +0100 Subject: [PATCH] Bug 850964 - Remove obsolete NS_FRAME_INVALIDATE_ON_MOVE flag. r=roc --- layout/generic/nsContainerFrame.h | 3 --- layout/tables/nsTableCellFrame.cpp | 2 +- layout/tables/nsTableFrame.cpp | 6 ++---- layout/tables/nsTableRowFrame.cpp | 2 +- layout/tables/nsTableRowGroupFrame.cpp | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h index 9e140447785..f10017d023b 100644 --- a/layout/generic/nsContainerFrame.h +++ b/layout/generic/nsContainerFrame.h @@ -20,9 +20,6 @@ #define NS_FRAME_NO_MOVE_FRAME (0x0002 | NS_FRAME_NO_MOVE_VIEW) #define NS_FRAME_NO_SIZE_VIEW 0x0004 #define NS_FRAME_NO_VISIBILITY 0x0008 -// Only applies to ReflowChild: if true, invalidate the child if it's -// being moved -#define NS_FRAME_INVALIDATE_ON_MOVE 0x0010 class nsOverflowContinuationTracker; namespace mozilla { diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index 2a66161675b..0c9eb164d91 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -887,7 +887,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsPresContext* aPresContext, bool firstReflow = (firstKid->GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0; ReflowChild(firstKid, aPresContext, kidSize, kidReflowState, - kidOrigin.x, kidOrigin.y, NS_FRAME_INVALIDATE_ON_MOVE, aStatus); + kidOrigin.x, kidOrigin.y, 0, aStatus); if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus)) { // Don't pass OVERFLOW_INCOMPLETE through tables until they can actually handle it //XXX should paginate overflow as overflow, but not in this patch (bug 379349) diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 099d68517bb..5cc8260c173 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -2694,8 +2694,7 @@ nsTableFrame::PlaceRepeatedFooter(nsTableReflowState& aReflowState, nsHTMLReflowMetrics desiredSize; desiredSize.width = desiredSize.height = 0; ReflowChild(aTfoot, presContext, desiredSize, footerReflowState, - aReflowState.x, aReflowState.y, - NS_FRAME_INVALIDATE_ON_MOVE, footerStatus); + aReflowState.x, aReflowState.y, 0, footerStatus); PlaceChild(aReflowState, aTfoot, desiredSize, origTfootRect, origTfootVisualOverflow); } @@ -2826,8 +2825,7 @@ nsTableFrame::ReflowChildren(nsTableReflowState& aReflowState, reorder = true; rv = ReflowChild(kidFrame, presContext, desiredSize, kidReflowState, - aReflowState.x, aReflowState.y, - NS_FRAME_INVALIDATE_ON_MOVE, aStatus); + aReflowState.x, aReflowState.y, 0, aStatus); if (reorder) { // reorder row groups the reflow may have changed the nextinflows diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp index f2aee9b7704..a269423d2b3 100644 --- a/layout/tables/nsTableRowFrame.cpp +++ b/layout/tables/nsTableRowFrame.cpp @@ -881,7 +881,7 @@ nsTableRowFrame::ReflowChildren(nsPresContext* aPresContext, nsReflowStatus status; rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, - x, 0, NS_FRAME_INVALIDATE_ON_MOVE, status); + x, 0, 0, status); // allow the table to determine if/how the table needs to be rebalanced // If any of the cells are not complete, then we're not complete diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp index 6fd4098a165..6e99fd6e5ab 100644 --- a/layout/tables/nsTableRowGroupFrame.cpp +++ b/layout/tables/nsTableRowGroupFrame.cpp @@ -368,8 +368,7 @@ nsTableRowGroupFrame::ReflowChildren(nsPresContext* aPresContext, } rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, - 0, aReflowState.y, NS_FRAME_INVALIDATE_ON_MOVE, - aStatus); + 0, aReflowState.y, 0, aStatus); // Place the child PlaceChild(aPresContext, aReflowState, kidFrame, desiredSize,