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

back out patch for bug 176423 (which I mistook for having sr). I'll leave the regression test case, since it doesn't crash.

This commit is contained in:
karnaze%netscape.com 2003-01-19 20:44:23 +00:00
Родитель cfba1a62c7
Коммит 436f9566be
2 изменённых файлов: 2 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -1294,13 +1294,6 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
// When style defines the width use it for the max-element-width
// because we can't shrink any smaller.
maxWidth = aMetrics.width;
if (NS_STYLE_OVERFLOW_HIDDEN != aReflowState.mStyleDisplay->mOverflow) {
// Allow overflowed children to influence mes width to accomodate tables.
nscoord inset = (NS_STYLE_DIRECTION_LTR == aState.mReflowState.mStyleVisibility->mDirection)
? borderPadding.left
: borderPadding.right;
maxWidth = PR_MAX(inset + aState.mMaxElementWidth, aMetrics.width);
}
}
else {
nscoord computedWidth;
@ -1534,7 +1527,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
if (aState.GetFlag(BRS_COMPUTEMAXWIDTH)) {
// We need to add in for the right border/padding
// XXXldb Why right and not left?
aMetrics.mMaximumWidth = PR_MAX(maxWidth, aState.mMaximumWidth + borderPadding.right);
aMetrics.mMaximumWidth = aState.mMaximumWidth + borderPadding.right;
#ifdef NOISY_MAXIMUM_WIDTH
printf("nsBlockFrame::ComputeFinalSize block %p setting aMetrics.mMaximumWidth to %d\n", this, aMetrics.mMaximumWidth);
#endif

9
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -1294,13 +1294,6 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
// When style defines the width use it for the max-element-width
// because we can't shrink any smaller.
maxWidth = aMetrics.width;
if (NS_STYLE_OVERFLOW_HIDDEN != aReflowState.mStyleDisplay->mOverflow) {
// Allow overflowed children to influence mes width to accomodate tables.
nscoord inset = (NS_STYLE_DIRECTION_LTR == aState.mReflowState.mStyleVisibility->mDirection)
? borderPadding.left
: borderPadding.right;
maxWidth = PR_MAX(inset + aState.mMaxElementWidth, aMetrics.width);
}
}
else {
nscoord computedWidth;
@ -1534,7 +1527,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
if (aState.GetFlag(BRS_COMPUTEMAXWIDTH)) {
// We need to add in for the right border/padding
// XXXldb Why right and not left?
aMetrics.mMaximumWidth = PR_MAX(maxWidth, aState.mMaximumWidth + borderPadding.right);
aMetrics.mMaximumWidth = aState.mMaximumWidth + borderPadding.right;
#ifdef NOISY_MAXIMUM_WIDTH
printf("nsBlockFrame::ComputeFinalSize block %p setting aMetrics.mMaximumWidth to %d\n", this, aMetrics.mMaximumWidth);
#endif