Remove/simplify frame list use. b=510137 r=bernd

This commit is contained in:
Mats Palmgren 2009-09-04 23:07:43 +02:00
Родитель 845f8b59d7
Коммит 4093f253d0
2 изменённых файлов: 12 добавлений и 25 удалений

Просмотреть файл

@ -1309,19 +1309,11 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
return shift;
}
/**
* These 3 functions are called by the row group frame's SplitRowGroup() code when
* it creates a continuing cell frame and wants to insert it into the row's child list
/*
* The following method is called by the row group frame's SplitRowGroup()
* when it creates a continuing cell frame and wants to insert it into the
* row's child list.
*/
void
nsTableRowFrame::InsertCellFrame(nsTableCellFrame* aFrame,
nsTableCellFrame* aPrevSibling)
{
mFrames.InsertFrame(nsnull, aPrevSibling, aFrame);
aFrame->SetParent(this);
}
void
nsTableRowFrame::InsertCellFrame(nsTableCellFrame* aFrame,
PRInt32 aColIndex)
@ -1340,14 +1332,7 @@ nsTableRowFrame::InsertCellFrame(nsTableCellFrame* aFrame,
else break;
}
}
InsertCellFrame(aFrame, priorCell);
}
void
nsTableRowFrame::RemoveCellFrame(nsTableCellFrame* aFrame)
{
if (!mFrames.RemoveFrame(aFrame))
NS_ASSERTION(PR_FALSE, "frame not in list");
mFrames.InsertFrame(this, priorCell, aFrame);
}
nsIAtom*

Просмотреть файл

@ -188,14 +188,16 @@ public:
PRBool aCollapseGroup,
PRBool& aDidCollapse);
void InsertCellFrame(nsTableCellFrame* aFrame,
nsTableCellFrame* aPrevSibling);
/**
* Insert a cell frame after the last cell frame that has a col index
* that is less than aColIndex. If no such cell frame is found the
* frame to insert is prepended to the child list.
* @param aFrame the cell frame to insert
* @param aColIndex the col index
*/
void InsertCellFrame(nsTableCellFrame* aFrame,
PRInt32 aColIndex);
void RemoveCellFrame(nsTableCellFrame* aFrame);
nsresult CalculateCellActualSize(nsIFrame* aRowFrame,
nscoord& aDesiredWidth,
nscoord& aDesiredHeight,