Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 01:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r=troy@netscape.com Changed from karnaze@netscape.com reviewed by me that

Browse Source 
fix assertions we were hitting when printing the CNN page
This commit is contained in:
troy%netscape.com 2000-01-15 05:50:27 +00:00
parent 8a7719fa46
commit f06d670145
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/html/table/src/nsCellMap.cpp
View File

@ -408,12 +408,13 @@ PRInt32
nsTableCellMap::GetEffectiveColSpan(PRInt32 aColIndex, nsTableCellMap::GetEffectiveColSpan(PRInt32 aColIndex,
const nsTableCellFrame* aCell) const nsTableCellFrame* aCell)
{ {
nsTableCellFrame* cellFrame = (nsTableCellFrame*)aCell->GetFirstInFlow();
PRInt32 rowIndex; PRInt32 rowIndex;
aCell->GetRowIndex(rowIndex); cellFrame->GetRowIndex(rowIndex);
nsCellMap* cellMap = mFirstMap; nsCellMap* cellMap = mFirstMap;
while (cellMap) { while (cellMap) {
if (cellMap->GetRowCount() > rowIndex) { if (cellMap->GetRowCount() > rowIndex) {
return cellMap->GetEffectiveColSpan(rowIndex, aColIndex, mCols.Count(), aCell); return cellMap->GetEffectiveColSpan(rowIndex, aColIndex, mCols.Count(), cellFrame);
} }
rowIndex -= cellMap->GetRowCount(); rowIndex -= cellMap->GetRowCount();
cellMap = cellMap->GetNextSibling(); cellMap = cellMap->GetNextSibling();

5
layout/tables/nsCellMap.cpp
View File

@ -408,12 +408,13 @@ PRInt32
nsTableCellMap::GetEffectiveColSpan(PRInt32 aColIndex, nsTableCellMap::GetEffectiveColSpan(PRInt32 aColIndex,
const nsTableCellFrame* aCell) const nsTableCellFrame* aCell)
{ {
nsTableCellFrame* cellFrame = (nsTableCellFrame*)aCell->GetFirstInFlow();
PRInt32 rowIndex; PRInt32 rowIndex;
aCell->GetRowIndex(rowIndex); cellFrame->GetRowIndex(rowIndex);
nsCellMap* cellMap = mFirstMap; nsCellMap* cellMap = mFirstMap;
while (cellMap) { while (cellMap) {
if (cellMap->GetRowCount() > rowIndex) { if (cellMap->GetRowCount() > rowIndex) {
return cellMap->GetEffectiveColSpan(rowIndex, aColIndex, mCols.Count(), aCell); return cellMap->GetEffectiveColSpan(rowIndex, aColIndex, mCols.Count(), cellFrame);
} }
rowIndex -= cellMap->GetRowCount(); rowIndex -= cellMap->GetRowCount();
cellMap = cellMap->GetNextSibling(); cellMap = cellMap->GetNextSibling();