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

added brakets in switch() statements in a vain attempt to fix the unix build bustages

This commit is contained in:
pierre%netscape.com 2001-01-20 23:33:29 +00:00
Родитель 715fd770ad
Коммит bda1df7356
3 изменённых файлов: 24 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
content/base/src/nsStyleContext.cpp
Просмотреть файл

@ -405,18 +405,21 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
if (nsnull != parentContext) { if (nsnull != parentContext) {
nsMargin parentSide; nsMargin parentSide;
switch (aSpacing) { switch (aSpacing) {
case NS_SPACING_MARGIN: case NS_SPACING_MARGIN: {
const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin); const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin);
parentMargin->CalcMarginFor(parentFrame, parentSide); parentMargin->CalcMarginFor(parentFrame, parentSide);
break; break;
case NS_SPACING_PADDING: }
case NS_SPACING_PADDING: {
const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding); const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding);
parentPadding->CalcPaddingFor(parentFrame, parentSide); parentPadding->CalcPaddingFor(parentFrame, parentSide);
break; break;
case NS_SPACING_BORDER: }
case NS_SPACING_BORDER: {
const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border); const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border);
parentBorder->CalcBorderFor(parentFrame, parentSide); parentBorder->CalcBorderFor(parentFrame, parentSide);
break; break;
}
} }
switch (aSide) { switch (aSide) {
case NS_SIDE_LEFT: result = parentSide.left; break; case NS_SIDE_LEFT: result = parentSide.left; break;
@ -3545,7 +3548,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
case eStyleStruct_Outline: case eStyleStruct_Outline:
GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct); GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct);
break; break;
case eStyleStruct_BorderPaddingShortcut: case eStyleStruct_BorderPaddingShortcut: {
nsMargin border, padding; nsMargin border, padding;
if (GETSCDATA(Border).GetBorder(border)) { if (GETSCDATA(Border).GetBorder(border)) {
if (GETSCDATA(Padding).GetPadding(padding)) { if (GETSCDATA(Padding).GetPadding(padding)) {
@ -3554,6 +3557,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
} }
} }
break; break;
}
default: default:
NS_ERROR("Invalid style struct id"); NS_ERROR("Invalid style struct id");
result = NS_ERROR_INVALID_ARG; result = NS_ERROR_INVALID_ARG;

12
layout/base/src/nsStyleContext.cpp
Просмотреть файл

@ -405,18 +405,21 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
if (nsnull != parentContext) { if (nsnull != parentContext) {
nsMargin parentSide; nsMargin parentSide;
switch (aSpacing) { switch (aSpacing) {
case NS_SPACING_MARGIN: case NS_SPACING_MARGIN: {
const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin); const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin);
parentMargin->CalcMarginFor(parentFrame, parentSide); parentMargin->CalcMarginFor(parentFrame, parentSide);
break; break;
case NS_SPACING_PADDING: }
case NS_SPACING_PADDING: {
const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding); const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding);
parentPadding->CalcPaddingFor(parentFrame, parentSide); parentPadding->CalcPaddingFor(parentFrame, parentSide);
break; break;
case NS_SPACING_BORDER: }
case NS_SPACING_BORDER: {
const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border); const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border);
parentBorder->CalcBorderFor(parentFrame, parentSide); parentBorder->CalcBorderFor(parentFrame, parentSide);
break; break;
}
} }
switch (aSide) { switch (aSide) {
case NS_SIDE_LEFT: result = parentSide.left; break; case NS_SIDE_LEFT: result = parentSide.left; break;
@ -3545,7 +3548,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
case eStyleStruct_Outline: case eStyleStruct_Outline:
GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct); GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct);
break; break;
case eStyleStruct_BorderPaddingShortcut: case eStyleStruct_BorderPaddingShortcut: {
nsMargin border, padding; nsMargin border, padding;
if (GETSCDATA(Border).GetBorder(border)) { if (GETSCDATA(Border).GetBorder(border)) {
if (GETSCDATA(Padding).GetPadding(padding)) { if (GETSCDATA(Padding).GetPadding(padding)) {
@ -3554,6 +3557,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
} }
} }
break; break;
}
default: default:
NS_ERROR("Invalid style struct id"); NS_ERROR("Invalid style struct id");
result = NS_ERROR_INVALID_ARG; result = NS_ERROR_INVALID_ARG;

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

@ -405,18 +405,21 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
if (nsnull != parentContext) { if (nsnull != parentContext) {
nsMargin parentSide; nsMargin parentSide;
switch (aSpacing) { switch (aSpacing) {
case NS_SPACING_MARGIN: case NS_SPACING_MARGIN: {
const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin); const nsStyleMargin* parentMargin = (const nsStyleMargin*)parentContext->GetStyleData(eStyleStruct_Margin);
parentMargin->CalcMarginFor(parentFrame, parentSide); parentMargin->CalcMarginFor(parentFrame, parentSide);
break; break;
case NS_SPACING_PADDING: }
case NS_SPACING_PADDING: {
const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding); const nsStylePadding* parentPadding = (const nsStylePadding*)parentContext->GetStyleData(eStyleStruct_Padding);
parentPadding->CalcPaddingFor(parentFrame, parentSide); parentPadding->CalcPaddingFor(parentFrame, parentSide);
break; break;
case NS_SPACING_BORDER: }
case NS_SPACING_BORDER: {
const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border); const nsStyleBorder* parentBorder = (const nsStyleBorder*)parentContext->GetStyleData(eStyleStruct_Border);
parentBorder->CalcBorderFor(parentFrame, parentSide); parentBorder->CalcBorderFor(parentFrame, parentSide);
break; break;
}
} }
switch (aSide) { switch (aSide) {
case NS_SIDE_LEFT: result = parentSide.left; break; case NS_SIDE_LEFT: result = parentSide.left; break;
@ -3545,7 +3548,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
case eStyleStruct_Outline: case eStyleStruct_Outline:
GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct); GETSCDATA(Outline).CopyTo((nsStyleOutline&)aStruct);
break; break;
case eStyleStruct_BorderPaddingShortcut: case eStyleStruct_BorderPaddingShortcut: {
nsMargin border, padding; nsMargin border, padding;
if (GETSCDATA(Border).GetBorder(border)) { if (GETSCDATA(Border).GetBorder(border)) {
if (GETSCDATA(Padding).GetPadding(padding)) { if (GETSCDATA(Padding).GetPadding(padding)) {
@ -3554,6 +3557,7 @@ StyleContextImpl::GetStyle(nsStyleStructID aSID, nsStyleStruct& aStruct) const
} }
} }
break; break;
}
default: default:
NS_ERROR("Invalid style struct id"); NS_ERROR("Invalid style struct id");
result = NS_ERROR_INVALID_ARG; result = NS_ERROR_INVALID_ARG;