mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 759249. r=bz
This commit is contained in:
parent
31ebbec1cb
commit
7ae3b05b92
@ -492,6 +492,7 @@ void nsTableFrame::InsertColGroups(PRInt32 aStartColIndex,
|
|||||||
PRInt32 colIndex = aStartColIndex;
|
PRInt32 colIndex = aStartColIndex;
|
||||||
nsFrameList::Enumerator colGroups(aColGroups);
|
nsFrameList::Enumerator colGroups(aColGroups);
|
||||||
for (; !colGroups.AtEnd(); colGroups.Next()) {
|
for (; !colGroups.AtEnd(); colGroups.Next()) {
|
||||||
|
MOZ_ASSERT(colGroups.get()->GetType() == nsGkAtoms::tableColGroupFrame);
|
||||||
nsTableColGroupFrame* cgFrame =
|
nsTableColGroupFrame* cgFrame =
|
||||||
static_cast<nsTableColGroupFrame*>(colGroups.get());
|
static_cast<nsTableColGroupFrame*>(colGroups.get());
|
||||||
cgFrame->SetStartColumnIndex(colIndex);
|
cgFrame->SetStartColumnIndex(colIndex);
|
||||||
@ -1341,12 +1342,13 @@ nsTableFrame::SetColumnDimensions(nscoord aHeight,
|
|||||||
PRInt32 tableColIncr = tableIsLTR ? 1 : -1;
|
PRInt32 tableColIncr = tableIsLTR ? 1 : -1;
|
||||||
nsPoint colGroupOrigin(aBorderPadding.left + cellSpacingX,
|
nsPoint colGroupOrigin(aBorderPadding.left + cellSpacingX,
|
||||||
aBorderPadding.top + cellSpacingY);
|
aBorderPadding.top + cellSpacingY);
|
||||||
while (nsnull != colGroupFrame) {
|
while (colGroupFrame) {
|
||||||
|
MOZ_ASSERT(colGroupFrame->GetType() == nsGkAtoms::tableColGroupFrame);
|
||||||
nscoord colGroupWidth = 0;
|
nscoord colGroupWidth = 0;
|
||||||
nsTableIterator iterCol(*colGroupFrame);
|
nsTableIterator iterCol(*colGroupFrame);
|
||||||
nsIFrame* colFrame = iterCol.First();
|
nsIFrame* colFrame = iterCol.First();
|
||||||
nsPoint colOrigin(0,0);
|
nsPoint colOrigin(0,0);
|
||||||
while (nsnull != colFrame) {
|
while (colFrame) {
|
||||||
if (NS_STYLE_DISPLAY_TABLE_COLUMN ==
|
if (NS_STYLE_DISPLAY_TABLE_COLUMN ==
|
||||||
colFrame->GetStyleDisplay()->mDisplay) {
|
colFrame->GetStyleDisplay()->mDisplay) {
|
||||||
NS_ASSERTION(colX < GetColCount(), "invalid number of columns");
|
NS_ASSERTION(colX < GetColCount(), "invalid number of columns");
|
||||||
|
Loading…
Reference in New Issue
Block a user