mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Removed an assert that was being triggered in a caseI didn't expect

This commit is contained in:
troy%netscape.com 1998-12-15 21:26:05 +00:00
Родитель 903af135d0
Коммит ca5d664aeb
2 изменённых файлов: 44 добавлений и 42 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
layout/html/table/src/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -872,9 +872,10 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus); rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
kidFrame->SizeTo(desiredSize.width, desiredSize.height); kidFrame->SizeTo(desiredSize.width, desiredSize.height);
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState); ((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 // Create a continuing frame, add it to the child list, and then push it
// and the frames that follow // and the frames that follow
// XXX Check whether it already has a next-in-flow // 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 // Push it and the frames that follow
PushChildren(continuingFrame, kidFrame); PushChildren(continuingFrame, kidFrame);
aDesiredSize.height = desiredSize.height; }
} else { } else {
// See whether the row frame has cells that span into it or across it // See whether the row frame has cells that span into it or across it

5
layout/tables/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -872,9 +872,10 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus); rv = ReflowChild(kidFrame, aPresContext, desiredSize, kidReflowState, aStatus);
kidFrame->SizeTo(desiredSize.width, desiredSize.height); kidFrame->SizeTo(desiredSize.width, desiredSize.height);
NS_ASSERTION(NS_FRAME_IS_NOT_COMPLETE(aStatus), "unexpected status");
((nsTableRowFrame *)kidFrame)->DidResize(aPresContext, aReflowState); ((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 // Create a continuing frame, add it to the child list, and then push it
// and the frames that follow // and the frames that follow
// XXX Check whether it already has a next-in-flow // 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 // Push it and the frames that follow
PushChildren(continuingFrame, kidFrame); PushChildren(continuingFrame, kidFrame);
aDesiredSize.height = desiredSize.height; }
} else { } else {
// See whether the row frame has cells that span into it or across it // See whether the row frame has cells that span into it or across it