Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4bfe5e636d68 (bug 850964) for assertions on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2013-03-14 15:19:06 +00:00
parent 7fc7f86f26
commit ee99ebb3df
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsContainerFrame.h
View File

@ -20,6 +20,9 @@
#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 {

2
layout/tables/nsTableCellFrame.cpp
View File

@ -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, 0, aStatus);
kidOrigin.x, kidOrigin.y, NS_FRAME_INVALIDATE_ON_MOVE, 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)

6
layout/tables/nsTableFrame.cpp
View File

@ -2694,7 +2694,8 @@ nsTableFrame::PlaceRepeatedFooter(nsTableReflowState& aReflowState,
nsHTMLReflowMetrics desiredSize;
desiredSize.width = desiredSize.height = 0;
ReflowChild(aTfoot, presContext, desiredSize, footerReflowState,
aReflowState.x, aReflowState.y, 0, footerStatus);
aReflowState.x, aReflowState.y,
NS_FRAME_INVALIDATE_ON_MOVE, footerStatus);
PlaceChild(aReflowState, aTfoot, desiredSize, origTfootRect,
origTfootVisualOverflow);
}
@ -2825,7 +2826,8 @@ nsTableFrame::ReflowChildren(nsTableReflowState& aReflowState,
reorder = true;
rv = ReflowChild(kidFrame, presContext, desiredSize, kidReflowState,
aReflowState.x, aReflowState.y, 0, aStatus);
aReflowState.x, aReflowState.y,
NS_FRAME_INVALIDATE_ON_MOVE, aStatus);
if (reorder) {
// reorder row groups the reflow may have changed the nextinflows

2
layout/tables/nsTableRowFrame.cpp
View File

@ -881,7 +881,7 @@ nsTableRowFrame::ReflowChildren(nsPresContext* aPresContext,
nsReflowStatus status;
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState,
x, 0, 0, status);
x, 0, NS_FRAME_INVALIDATE_ON_MOVE, 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

3
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -368,7 +368,8 @@ nsTableRowGroupFrame::ReflowChildren(nsPresContext* aPresContext,
}
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState,
0, aReflowState.y, 0, aStatus);
0, aReflowState.y, NS_FRAME_INVALIDATE_ON_MOVE,
aStatus);
// Place the child
PlaceChild(aPresContext, aReflowState, kidFrame, desiredSize,