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

removed assertions in new incremental layout methods

Browse Source
This commit is contained in:
karnaze%netscape.com 1999-08-22 23:56:39 +00:00
parent a900e17559
commit f6ebcc42ce
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,9 @@ void nsCellMap::SetColCollapsedAt(PRInt32 aCol, PRBool aValue)
PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const
{ {
NS_PRECONDITION ((0 <= aRowIndex) && (aRowIndex < mRowCount), "bad row index arg"); if ((0 > aRowIndex) || (aRowIndex >= mRowCount)) {
return PR_FALSE;
}
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
for (PRInt32 colIndex = 0; colIndex < colCount; colIndex++) { for (PRInt32 colIndex = 0; colIndex < colCount; colIndex++) {
CellData* cd = GetCellAt(aRowIndex, colIndex); CellData* cd = GetCellAt(aRowIndex, colIndex);
@ -500,7 +502,9 @@ PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const
PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const
{ {
NS_PRECONDITION ((0 <= aRowIndex) && (aRowIndex < mRowCount), "bad row index arg"); if ((0 > aRowIndex) || (aRowIndex >= mRowCount)) {
return PR_FALSE;
}
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
if (aRowIndex != mRowCount - 1) { if (aRowIndex != mRowCount - 1) {
// aRowIndex is not the last row, so we check the next row after aRowIndex for spanners // aRowIndex is not the last row, so we check the next row after aRowIndex for spanners
@ -520,7 +524,9 @@ PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const
PRBool nsCellMap::ColIsSpannedInto(PRInt32 aColIndex) const PRBool nsCellMap::ColIsSpannedInto(PRInt32 aColIndex) const
{ {
NS_PRECONDITION ((0 <= aColIndex) && (aColIndex < mNumCellsInCol.Count()), "bad col index arg"); if ((0 > aColIndex) || (aColIndex >= mNumCellsInCol.Count())) {
return PR_FALSE;
}
for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) { for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) {
CellData* cd = GetCellAt(rowIndex, aColIndex); CellData* cd = GetCellAt(rowIndex, aColIndex);
if (cd) { // there's really a cell at (aRowIndex, colIndex) if (cd) { // there's really a cell at (aRowIndex, colIndex)
@ -537,8 +543,9 @@ PRBool nsCellMap::ColHasSpanningCells(PRInt32 aColIndex) const
{ {
NS_PRECONDITION (aColIndex < mNumCellsInCol.Count(), "bad col index arg"); NS_PRECONDITION (aColIndex < mNumCellsInCol.Count(), "bad col index arg");
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
if (aColIndex >= colCount - 1) if ((0 > aColIndex) || (aColIndex >= colCount - 1))
return PR_FALSE; return PR_FALSE;
for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) { for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) {
CellData* cd = GetCellAt(rowIndex, aColIndex); CellData* cd = GetCellAt(rowIndex, aColIndex);
if (cd && (cd->mOrigCell)) { // cell originates if (cd && (cd->mOrigCell)) { // cell originates

15
layout/tables/nsCellMap.cpp
View File

@ -484,7 +484,9 @@ void nsCellMap::SetColCollapsedAt(PRInt32 aCol, PRBool aValue)
PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const
{ {
NS_PRECONDITION ((0 <= aRowIndex) && (aRowIndex < mRowCount), "bad row index arg"); if ((0 > aRowIndex) || (aRowIndex >= mRowCount)) {
return PR_FALSE;
}
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
for (PRInt32 colIndex = 0; colIndex < colCount; colIndex++) { for (PRInt32 colIndex = 0; colIndex < colCount; colIndex++) {
CellData* cd = GetCellAt(aRowIndex, colIndex); CellData* cd = GetCellAt(aRowIndex, colIndex);
@ -500,7 +502,9 @@ PRBool nsCellMap::RowIsSpannedInto(PRInt32 aRowIndex) const
PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const
{ {
NS_PRECONDITION ((0 <= aRowIndex) && (aRowIndex < mRowCount), "bad row index arg"); if ((0 > aRowIndex) || (aRowIndex >= mRowCount)) {
return PR_FALSE;
}
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
if (aRowIndex != mRowCount - 1) { if (aRowIndex != mRowCount - 1) {
// aRowIndex is not the last row, so we check the next row after aRowIndex for spanners // aRowIndex is not the last row, so we check the next row after aRowIndex for spanners
@ -520,7 +524,9 @@ PRBool nsCellMap::RowHasSpanningCells(PRInt32 aRowIndex) const
PRBool nsCellMap::ColIsSpannedInto(PRInt32 aColIndex) const PRBool nsCellMap::ColIsSpannedInto(PRInt32 aColIndex) const
{ {
NS_PRECONDITION ((0 <= aColIndex) && (aColIndex < mNumCellsInCol.Count()), "bad col index arg"); if ((0 > aColIndex) || (aColIndex >= mNumCellsInCol.Count())) {
return PR_FALSE;
}
for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) { for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) {
CellData* cd = GetCellAt(rowIndex, aColIndex); CellData* cd = GetCellAt(rowIndex, aColIndex);
if (cd) { // there's really a cell at (aRowIndex, colIndex) if (cd) { // there's really a cell at (aRowIndex, colIndex)
@ -537,8 +543,9 @@ PRBool nsCellMap::ColHasSpanningCells(PRInt32 aColIndex) const
{ {
NS_PRECONDITION (aColIndex < mNumCellsInCol.Count(), "bad col index arg"); NS_PRECONDITION (aColIndex < mNumCellsInCol.Count(), "bad col index arg");
PRInt32 colCount = mNumCellsInCol.Count(); PRInt32 colCount = mNumCellsInCol.Count();
if (aColIndex >= colCount - 1) if ((0 > aColIndex) || (aColIndex >= colCount - 1))
return PR_FALSE; return PR_FALSE;
for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) { for (PRInt32 rowIndex = 0; rowIndex < mRowCount; rowIndex++) {
CellData* cd = GetCellAt(rowIndex, aColIndex); CellData* cd = GetCellAt(rowIndex, aColIndex);
if (cd && (cd->mOrigCell)) { // cell originates if (cd && (cd->mOrigCell)) { // cell originates