mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 73321 - fix regression caused by the cleanup bug 70989.

This commit is contained in:
karnaze%netscape.com 2001-03-26 05:16:32 +00:00
Родитель 1f75f9f108
Коммит cda057884b
2 изменённых файлов: 12 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
layout/html/table/src/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -642,12 +642,12 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
// iterate every row starting at last row spanned and up to the row with
// the spanning cell. do this bottom up so that special rows can get a full
// allocation before other rows.
startRowIndex = rowIndex + rowSpan - 1;
for (PRInt32 rowX = startRowIndex; (rowX >= rowIndex) && (excessAvail > 0); rowX--) {
PRInt32 beginRowIndex = rowIndex + rowSpan - 1;
for (PRInt32 rowX = beginRowIndex; (rowX >= rowIndex) && (excessAvail > 0); rowX--) {
nscoord excessForRow = 0;
// special rows gets as much as they can
if (rowHeights[rowX] <= 0) {
if ((rowX == startRowIndex) || (!cellsOrigInSpan)) {
if ((rowX == beginRowIndex) || (!cellsOrigInSpan)) {
if (0 == rowHeights[rowX]) {
// give it all since no cell originates in the row
excessForRow = excessBasis;
@ -682,11 +682,11 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
// allocation involving special rows couldn't allocate everything.
// just give the remainder to the last row spanned.
if (excessAvail > 0) {
if (rowHeights[startRowIndex] >= 0) {
rowHeights[startRowIndex] += excessAvail;
if (rowHeights[beginRowIndex] >= 0) {
rowHeights[beginRowIndex] += excessAvail;
}
else {
rowHeights[startRowIndex] = excessAvail;
rowHeights[beginRowIndex] = excessAvail;
}
}
}

12
layout/tables/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -642,12 +642,12 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
// iterate every row starting at last row spanned and up to the row with
// the spanning cell. do this bottom up so that special rows can get a full
// allocation before other rows.
startRowIndex = rowIndex + rowSpan - 1;
for (PRInt32 rowX = startRowIndex; (rowX >= rowIndex) && (excessAvail > 0); rowX--) {
PRInt32 beginRowIndex = rowIndex + rowSpan - 1;
for (PRInt32 rowX = beginRowIndex; (rowX >= rowIndex) && (excessAvail > 0); rowX--) {
nscoord excessForRow = 0;
// special rows gets as much as they can
if (rowHeights[rowX] <= 0) {
if ((rowX == startRowIndex) || (!cellsOrigInSpan)) {
if ((rowX == beginRowIndex) || (!cellsOrigInSpan)) {
if (0 == rowHeights[rowX]) {
// give it all since no cell originates in the row
excessForRow = excessBasis;
@ -682,11 +682,11 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext* aPresContext,
// allocation involving special rows couldn't allocate everything.
// just give the remainder to the last row spanned.
if (excessAvail > 0) {
if (rowHeights[startRowIndex] >= 0) {
rowHeights[startRowIndex] += excessAvail;
if (rowHeights[beginRowIndex] >= 0) {
rowHeights[beginRowIndex] += excessAvail;
}
else {
rowHeights[startRowIndex] = excessAvail;
rowHeights[beginRowIndex] = excessAvail;
}
}
}