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

Changed code that previously accessed mBorderStyle and mBorderColor 

with the new methods added in nsStyleSpacing
This commit is contained in:
harishd%netscape.com 1998-12-07 18:55:19 +00:00
Родитель 291530375c
Коммит fa72f8598e
2 изменённых файлов: 28 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
content/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -1617,28 +1617,30 @@ nsGenericHTMLElement::MapImageBorderAttributesInto(nsIHTMLAttributes* aAttribute
spacing->mBorder.SetRight(coord);
spacing->mBorder.SetBottom(coord);
spacing->mBorder.SetLeft(coord);
spacing->mBorderStyle[0] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[1] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[2] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[3] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->SetBorderStyle(0,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(1,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(2,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(3,NS_STYLE_BORDER_STYLE_SOLID);
// Use supplied colors if provided, otherwise use color for border
// color
if (nsnull != aBorderColors) {
spacing->mBorderColor[0] = aBorderColors[0];
spacing->mBorderColor[1] = aBorderColors[1];
spacing->mBorderColor[2] = aBorderColors[2];
spacing->mBorderColor[3] = aBorderColors[3];
spacing->SetBorderColor(0, aBorderColors[0]);
spacing->SetBorderColor(1, aBorderColors[1]);
spacing->SetBorderColor(2, aBorderColors[2]);
spacing->SetBorderColor(3, aBorderColors[3]);
}
else {
// Color is inherited from "color"
const nsStyleColor* styleColor = (const nsStyleColor*)
aContext->GetStyleData(eStyleStruct_Color);
nscolor color = styleColor->mColor;
spacing->mBorderColor[0] = color;
spacing->mBorderColor[1] = color;
spacing->mBorderColor[2] = color;
spacing->mBorderColor[3] = color;
spacing->SetBorderColor(0, color);
spacing->SetBorderColor(1, color);
spacing->SetBorderColor(2, color);
spacing->SetBorderColor(3, color);
}
}
}

26
layout/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -1617,28 +1617,30 @@ nsGenericHTMLElement::MapImageBorderAttributesInto(nsIHTMLAttributes* aAttribute
spacing->mBorder.SetRight(coord);
spacing->mBorder.SetBottom(coord);
spacing->mBorder.SetLeft(coord);
spacing->mBorderStyle[0] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[1] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[2] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->mBorderStyle[3] = NS_STYLE_BORDER_STYLE_SOLID;
spacing->SetBorderStyle(0,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(1,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(2,NS_STYLE_BORDER_STYLE_SOLID);
spacing->SetBorderStyle(3,NS_STYLE_BORDER_STYLE_SOLID);
// Use supplied colors if provided, otherwise use color for border
// color
if (nsnull != aBorderColors) {
spacing->mBorderColor[0] = aBorderColors[0];
spacing->mBorderColor[1] = aBorderColors[1];
spacing->mBorderColor[2] = aBorderColors[2];
spacing->mBorderColor[3] = aBorderColors[3];
spacing->SetBorderColor(0, aBorderColors[0]);
spacing->SetBorderColor(1, aBorderColors[1]);
spacing->SetBorderColor(2, aBorderColors[2]);
spacing->SetBorderColor(3, aBorderColors[3]);
}
else {
// Color is inherited from "color"
const nsStyleColor* styleColor = (const nsStyleColor*)
aContext->GetStyleData(eStyleStruct_Color);
nscolor color = styleColor->mColor;
spacing->mBorderColor[0] = color;
spacing->mBorderColor[1] = color;
spacing->mBorderColor[2] = color;
spacing->mBorderColor[3] = color;
spacing->SetBorderColor(0, color);
spacing->SetBorderColor(1, color);
spacing->SetBorderColor(2, color);
spacing->SetBorderColor(3, color);
}
}
}