CMXSL.org/trisquel-icecat
2
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

icecat: add release icecat-140.10.1-1gnu1 for ecne

Browse source
This commit is contained in:
Ark74 2026-05-04 16:58:41 -06:00
parent a5f93cb214
commit ff85d7c623
1256 changed files with 63469 additions and 24141 deletions
Download patch file Download diff file Expand all files Collapse all files

10
icecat/layout/tables/nsCellMap.cpp
View file

@ -1845,7 +1845,9 @@ int32_t nsCellMap::GetEffectiveColSpan(const nsTableCellMap& aMap,
break;
}
}
return colSpan;
// Enforce that the effective colSpan is between 1 and MAX_COLSPAN:
return std::clamp(colSpan, 1, MAX_COLSPAN);
}
int32_t nsCellMap::GetRowSpanForNewCell(nsTableCellFrame* aCellFrameToAdd,
@ -1856,7 +1858,7 @@ int32_t nsCellMap::GetRowSpanForNewCell(nsTableCellFrame* aCellFrameToAdd,
if (0 == rowSpan) {
// Use a min value of 2 for a zero rowspan to make computations easier
// elsewhere. Zero rowspans are only content dependent!
rowSpan = std::max(2, mContentRowCount - aRowIndex);
rowSpan = std::clamp(mContentRowCount - aRowIndex, 2, MAX_ROWSPAN);
aIsZeroRowSpan = true;
}
return rowSpan;
@ -1910,7 +1912,9 @@ int32_t nsCellMap::GetRowSpan(int32_t aRowIndex, int32_t aColIndex,
break;
}
}
return rowSpan;
// Enforce that the effective rowSpan is between 1 and MAX_ROWSPAN:
return std::clamp(rowSpan, 1, MAX_ROWSPAN);
}
void nsCellMap::ShrinkWithoutCell(nsTableCellMap& aMap,