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

Removed bogus null pointer check

This commit is contained in:
kipp%netscape.com 1998-12-15 17:59:49 +00:00
Родитель b4dfff8ca9
Коммит dafa9178f7
2 изменённых файлов: 56 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -283,42 +283,40 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit, PRBool aApplyTopMargin,
// margins this code is not yet complete. This code may need to
// move to before reflowing the frame instead of after (because
// of floater positioning).
nscoord remainder = mSpace.XMost() - (x + mMetrics.width + mMargin.right);
nscoord remainder = mSpace.XMost() -
(x + mMetrics.width + mMargin.right);
if (remainder >= 0) {
// The block frame didn't use all of the available space. Apply
// auto margins.
const nsStyleSpacing* spacing = mSpacing;
if (nsnull != mSpacing) {
nsStyleUnit leftUnit = mSpacing->mMargin.GetLeftUnit();
nsStyleUnit rightUnit = mSpacing->mMargin.GetRightUnit();
if (eStyleUnit_Auto == leftUnit) {
if (eStyleUnit_Auto == rightUnit) {
// When both margins are auto, we center the block
x += remainder / 2;
}
else {
x += remainder;
}
nsStyleUnit leftUnit = mSpacing->mMargin.GetLeftUnit();
nsStyleUnit rightUnit = mSpacing->mMargin.GetRightUnit();
if (eStyleUnit_Auto == leftUnit) {
if (eStyleUnit_Auto == rightUnit) {
// When both margins are auto, we center the block
x += remainder / 2;
}
else if (eStyleUnit_Auto != rightUnit) {
// When neither margin is auto then text-align applies
const nsStyleText* styleText = mOuterReflowState.mStyleText;
switch (styleText->mTextAlign) {
case NS_STYLE_TEXT_ALIGN_DEFAULT:
case NS_STYLE_TEXT_ALIGN_JUSTIFY:
if (NS_STYLE_DIRECTION_RTL == mOuterReflowState.mDirection) {
// When given a default alignment, and a right-to-left
// direction, right align the frame.
x += remainder;
}
break;
case NS_STYLE_TEXT_ALIGN_RIGHT:
else {
x += remainder;
}
}
else if (eStyleUnit_Auto != rightUnit) {
// When neither margin is auto then text-align applies
const nsStyleText* styleText = mOuterReflowState.mStyleText;
switch (styleText->mTextAlign) {
case NS_STYLE_TEXT_ALIGN_DEFAULT:
case NS_STYLE_TEXT_ALIGN_JUSTIFY:
if (NS_STYLE_DIRECTION_RTL == mOuterReflowState.mDirection) {
// When given a default alignment, and a right-to-left
// direction, right align the frame.
x += remainder;
break;
case NS_STYLE_TEXT_ALIGN_CENTER:
x += remainder / 2;
break;
}
break;
case NS_STYLE_TEXT_ALIGN_RIGHT:
x += remainder;
break;
case NS_STYLE_TEXT_ALIGN_CENTER:
x += remainder / 2;
break;
}
}
}

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

@ -283,42 +283,40 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit, PRBool aApplyTopMargin,
// margins this code is not yet complete. This code may need to
// move to before reflowing the frame instead of after (because
// of floater positioning).
nscoord remainder = mSpace.XMost() - (x + mMetrics.width + mMargin.right);
nscoord remainder = mSpace.XMost() -
(x + mMetrics.width + mMargin.right);
if (remainder >= 0) {
// The block frame didn't use all of the available space. Apply
// auto margins.
const nsStyleSpacing* spacing = mSpacing;
if (nsnull != mSpacing) {
nsStyleUnit leftUnit = mSpacing->mMargin.GetLeftUnit();
nsStyleUnit rightUnit = mSpacing->mMargin.GetRightUnit();
if (eStyleUnit_Auto == leftUnit) {
if (eStyleUnit_Auto == rightUnit) {
// When both margins are auto, we center the block
x += remainder / 2;
}
else {
x += remainder;
}
nsStyleUnit leftUnit = mSpacing->mMargin.GetLeftUnit();
nsStyleUnit rightUnit = mSpacing->mMargin.GetRightUnit();
if (eStyleUnit_Auto == leftUnit) {
if (eStyleUnit_Auto == rightUnit) {
// When both margins are auto, we center the block
x += remainder / 2;
}
else if (eStyleUnit_Auto != rightUnit) {
// When neither margin is auto then text-align applies
const nsStyleText* styleText = mOuterReflowState.mStyleText;
switch (styleText->mTextAlign) {
case NS_STYLE_TEXT_ALIGN_DEFAULT:
case NS_STYLE_TEXT_ALIGN_JUSTIFY:
if (NS_STYLE_DIRECTION_RTL == mOuterReflowState.mDirection) {
// When given a default alignment, and a right-to-left
// direction, right align the frame.
x += remainder;
}
break;
case NS_STYLE_TEXT_ALIGN_RIGHT:
else {
x += remainder;
}
}
else if (eStyleUnit_Auto != rightUnit) {
// When neither margin is auto then text-align applies
const nsStyleText* styleText = mOuterReflowState.mStyleText;
switch (styleText->mTextAlign) {
case NS_STYLE_TEXT_ALIGN_DEFAULT:
case NS_STYLE_TEXT_ALIGN_JUSTIFY:
if (NS_STYLE_DIRECTION_RTL == mOuterReflowState.mDirection) {
// When given a default alignment, and a right-to-left
// direction, right align the frame.
x += remainder;
break;
case NS_STYLE_TEXT_ALIGN_CENTER:
x += remainder / 2;
break;
}
break;
case NS_STYLE_TEXT_ALIGN_RIGHT:
x += remainder;
break;
case NS_STYLE_TEXT_ALIGN_CENTER:
x += remainder / 2;
break;
}
}
}