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

Changed NS_ASSERTION to NS_WARN_IF_FALSE to avoid crashing people when condition is met. r=hyatt.

Browse Source
This commit is contained in:
tbogard%aol.net 1999-11-02 05:14:27 +00:00
parent e04693d65a
commit c2a26335bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/html/table/src/BasicTableLayoutStrategy.cpp
View File

@ -261,7 +261,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalCounts[PCT] > 0) {
if (totalAllocated + totalAvailWidths[PCT] - minWidths[PCT] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, PCT);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, PCT, PR_FALSE, allocTypes);
@ -272,7 +272,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[FIX] > 0) {
if (totalAllocated + totalAvailWidths[FIX] - minWidths[FIX] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, FIX);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, FIX, PR_TRUE, allocTypes);
@ -283,7 +283,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[FIX_ADJ] > 0) {
if (totalAllocated + totalAvailWidths[FIX_ADJ] - minWidths[FIX_ADJ] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, FIX_ADJ);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, FIX_ADJ, PR_TRUE, allocTypes);
@ -294,7 +294,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[MIN_PRO] > 0) {
if (totalAllocated + totalAvailWidths[MIN_PRO] - minWidths[MIN_PRO] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, MIN_PRO, PR_FALSE);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, MIN_PRO, PR_FALSE, allocTypes);
@ -306,7 +306,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[DES_CON] > 0) {
if (totalAllocated + totalAvailWidths[DES_CON] - minWidths[DES_CON]<= maxWidth) {
AllocateFully(totalAllocated, allocTypes, DES_CON);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, DES_CON, PR_FALSE, allocTypes);

10
layout/tables/BasicTableLayoutStrategy.cpp
View File

@ -261,7 +261,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalCounts[PCT] > 0) {
if (totalAllocated + totalAvailWidths[PCT] - minWidths[PCT] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, PCT);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, PCT, PR_FALSE, allocTypes);
@ -272,7 +272,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[FIX] > 0) {
if (totalAllocated + totalAvailWidths[FIX] - minWidths[FIX] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, FIX);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, FIX, PR_TRUE, allocTypes);
@ -283,7 +283,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[FIX_ADJ] > 0) {
if (totalAllocated + totalAvailWidths[FIX_ADJ] - minWidths[FIX_ADJ] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, FIX_ADJ);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, FIX_ADJ, PR_TRUE, allocTypes);
@ -294,7 +294,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[MIN_PRO] > 0) {
if (totalAllocated + totalAvailWidths[MIN_PRO] - minWidths[MIN_PRO] <= maxWidth) {
AllocateFully(totalAllocated, allocTypes, MIN_PRO, PR_FALSE);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, MIN_PRO, PR_FALSE, allocTypes);
@ -306,7 +306,7 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (totalAllocated < maxWidth && totalCounts[DES_CON] > 0) {
if (totalAllocated + totalAvailWidths[DES_CON] - minWidths[DES_CON]<= maxWidth) {
AllocateFully(totalAllocated, allocTypes, DES_CON);
NS_ASSERTION(totalAllocated <= maxWidth, "over allocated");
NS_WARN_IF_FALSE(totalAllocated <= maxWidth, "over allocated");
}
else {
AllocateConstrained(maxWidth - totalAllocated, DES_CON, PR_FALSE, allocTypes);