зеркало из https://github.com/mozilla/gecko-dev.git
fix handling of empty rowgroups (that are rg without a row beneath) in the border collapse code (bug 383193 r/sr=bzbarsky a=mtschrep
This commit is contained in:
Родитель
e6b2825825
Коммит
b64d41431a
|
@ -4222,20 +4222,14 @@ PRBool
|
||||||
BCMapCellIterator::SetNewRowGroup(PRBool aFindFirstDamagedRow)
|
BCMapCellIterator::SetNewRowGroup(PRBool aFindFirstDamagedRow)
|
||||||
{
|
{
|
||||||
mAtEnd = PR_TRUE;
|
mAtEnd = PR_TRUE;
|
||||||
mRowGroupIndex++;
|
|
||||||
PRInt32 numRowGroups = mRowGroups.Length();
|
PRInt32 numRowGroups = mRowGroups.Length();
|
||||||
mCellMap = nsnull;
|
mCellMap = nsnull;
|
||||||
for (PRInt32 rgX = mRowGroupIndex; rgX < numRowGroups; rgX++) {
|
for (mRowGroupIndex++; mRowGroupIndex < numRowGroups; mRowGroupIndex++) {
|
||||||
// XXXbz do we really want the group at mRowGroupIndex? If so, what's the
|
|
||||||
// point of this rgX loop variable, exactly? Why not just do a while
|
|
||||||
// (mRowGroupIndex < numRowGroups) loop or something? I suspect this means
|
|
||||||
// to be getting the rowgroup at rgX.
|
|
||||||
mRowGroup = mRowGroups[mRowGroupIndex];
|
mRowGroup = mRowGroups[mRowGroupIndex];
|
||||||
PRInt32 rowCount = mRowGroup->GetRowCount();
|
PRInt32 rowCount = mRowGroup->GetRowCount();
|
||||||
mRowGroupStart = mRowGroup->GetStartRowIndex();
|
mRowGroupStart = mRowGroup->GetStartRowIndex();
|
||||||
mRowGroupEnd = mRowGroupStart + rowCount - 1;
|
mRowGroupEnd = mRowGroupStart + rowCount - 1;
|
||||||
if (rowCount > 0) { // XXXbz and if it's not we just keep looping? What's
|
if (rowCount > 0) {
|
||||||
// the point?
|
|
||||||
mCellMap = mTableCellMap->GetMapFor(mRowGroup, mCellMap);
|
mCellMap = mTableCellMap->GetMapFor(mRowGroup, mCellMap);
|
||||||
if (!mCellMap) ABORT1(PR_FALSE);
|
if (!mCellMap) ABORT1(PR_FALSE);
|
||||||
nsTableRowFrame* firstRow = mRowGroup->GetFirstRow();
|
nsTableRowFrame* firstRow = mRowGroup->GetFirstRow();
|
||||||
|
@ -4252,7 +4246,6 @@ BCMapCellIterator::SetNewRowGroup(PRBool aFindFirstDamagedRow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mRowGroupIndex++;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче