Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

look out for zero rowspans when expanding the cellmap bug, 368651 r/sr=bzbarsky

Browse Source
This commit is contained in:
bmlk%gmx.de 2007-02-10 06:56:57 +00:00
parent b21c094911
commit 14281d618d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/tables/nsCellMap.cpp
View File

@ -1282,10 +1282,10 @@ nsCellMap::InsertRows(nsTableCellMap& aMap,
return;
}
}
// update mContentRowCount, since non-empty rows will be added
mContentRowCount = PR_MAX(aFirstRowIndex, mContentRowCount);
if (!aConsiderSpans) {
// update mContentRowCount, since non-empty rows will be added
mContentRowCount = PR_MAX(aFirstRowIndex, mContentRowCount);
ExpandWithRows(aMap, aRows, aFirstRowIndex, aDamageArea);
return;
}
@ -1293,6 +1293,9 @@ nsCellMap::InsertRows(nsTableCellMap& aMap,
// if any cells span into or out of the row being inserted, then rebuild
PRBool spansCauseRebuild = CellsSpanInOrOut(aFirstRowIndex,
aFirstRowIndex, 0, numCols - 1);
// update mContentRowCount, since non-empty rows will be added
mContentRowCount = PR_MAX(aFirstRowIndex, mContentRowCount);
// if any of the new cells span out of the new rows being added, then rebuild
// XXX it would be better to only rebuild the portion of the map that follows the new rows
@ -1613,6 +1616,12 @@ PRBool nsCellMap::CellsSpanInOrOut(PRInt32 aStartRowIndex,
if (cellData && (cellData->IsRowSpan())) {
return PR_TRUE; // there is a row span into the region
}
if ((aStartRowIndex >= mContentRowCount) && (mContentRowCount > 0)) {
cellData = GetDataAt(mContentRowCount - 1, colX);
if (cellData && cellData->IsZeroRowSpan()) {
return PR_TRUE; // When we expand the zerospan it'll span into our row
}
}
}
if (aEndRowIndex < numRows - 1) { // is there anything below aEndRowIndex
cellData = GetDataAt(aEndRowIndex + 1, colX);
@ -1974,8 +1983,9 @@ nsCellMap::GetRowSpanForNewCell(nsTableCellFrame* aCellFrameToAdd,
aIsZeroRowSpan = PR_FALSE;
PRInt32 rowSpan = aCellFrameToAdd->GetRowSpan();
if (0 == rowSpan) {
// use a min value of 2 for a zero rowspan to make computations easier elsewhere
rowSpan = PR_MAX(2, mContentRowCount - aRowIndex);
// Use a min value of 2 for a zero rowspan to make computations easier
// elsewhere. Zero rowspans are only content dependent!
rowSpan = PR_MAX(2, mContentRowCount - aRowIndex);
aIsZeroRowSpan = PR_TRUE;
}
return rowSpan;