зеркало из https://github.com/mozilla/gecko-dev.git
Removed an assert that was being triggered in a caseI didn't expect
This commit is contained in:
Родитель
903af135d0
Коммит
ca5d664aeb
|
@ -872,9 +872,10 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
|
|||
|
||||
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
|
||||
kidFrame->SizeTo(desiredSize.width, desiredSize.height);
|
||||
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
|
||||
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState);
|
||||
aDesiredSize.height = desiredSize.height;
|
||||
|
||||
if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) {
|
||||
// Create a continuing frame, add it to the child list, and then push it
|
||||
// and the frames that follow
|
||||
// XXX Check whether it already has a next-in-flow
|
||||
|
@ -894,7 +895,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
|
|||
|
||||
// Push it and the frames that follow
|
||||
PushChildren(continuingFrame, kidFrame);
|
||||
aDesiredSize.height = desiredSize.height;
|
||||
}
|
||||
|
||||
} else {
|
||||
// See whether the row frame has cells that span into it or across it
|
||||
|
|
|
@ -872,9 +872,10 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
|
|||
|
||||
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
|
||||
kidFrame->SizeTo(desiredSize.width, desiredSize.height);
|
||||
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
|
||||
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState);
|
||||
aDesiredSize.height = desiredSize.height;
|
||||
|
||||
if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) {
|
||||
// Create a continuing frame, add it to the child list, and then push it
|
||||
// and the frames that follow
|
||||
// XXX Check whether it already has a next-in-flow
|
||||
|
@ -894,7 +895,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
|
|||
|
||||
// Push it and the frames that follow
|
||||
PushChildren(continuingFrame, kidFrame);
|
||||
aDesiredSize.height = desiredSize.height;
|
||||
}
|
||||
|
||||
} else {
|
||||
// See whether the row frame has cells that span into it or across it
|
||||
|
|
Загрузка…
Ссылка в новой задаче