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

Make computed border-style and float be "none" by default. Bugs 120982 

and 120965, patch by Christopher Aillon <caillon@returnzero.com>,
r=bzbarsky, sr=jst
This commit is contained in:
bzbarsky%mit.edu 2002-01-24 21:19:21 +00:00
Родитель f60fd1c05c
Коммит 7815d37178
2 изменённых файлов: 38 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
content/html/style/src/nsComputedDOMStyle.cpp
Просмотреть файл

@ -711,18 +711,17 @@ nsComputedDOMStyle::GetCssFloat(nsIFrame *aFrame,
const nsStyleDisplay* display=nsnull;
GetStyleData(eStyleStruct_Display,(const nsStyleStruct*&)display,aFrame);
if(display) {
if(display && display->mFloats != NS_STYLE_FLOAT_NONE) {
const nsAFlatCString& cssFloat =
nsCSSProps::SearchKeywordTable(display->mFloats,
nsCSSProps::kFloatKTable);
nsCSSProps::kFloatKTable);
val->SetString(cssFloat);
}
else {
val->SetString(NS_LITERAL_STRING(""));
val->SetString(NS_LITERAL_STRING("none"));
}
return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue),
(void **)&aValue);
return CallQueryInterface(val, &aValue);
}
#if 0
@ -2841,11 +2840,11 @@ nsComputedDOMStyle::GetBorderWidthFor(PRUint8 aSide,
if(border) {
nsStyleCoord coord;
PRUint8 borderStyle = border->GetBorderStyle(aSide);
if (borderStyle == NS_STYLE_BORDER_STYLE_NONE) {
coord.SetCoordValue(0);
}
else {
PRUint8 borderStyle = border->GetBorderStyle(aSide);
if (borderStyle == NS_STYLE_BORDER_STYLE_NONE) {
coord.SetCoordValue(0);
}
else {
switch(aSide) {
case NS_SIDE_TOP:
border->mBorder.GetTop(coord); break;
@ -2976,18 +2975,23 @@ nsComputedDOMStyle::GetBorderStyleFor(PRUint8 aSide,
const nsStyleBorder* border = nsnull;
GetStyleData(eStyleStruct_Border, (const nsStyleStruct*&)border, aFrame);
if(border) {
PRUint8 borderStyle = NS_STYLE_BORDER_STYLE_NONE;
if (border) {
borderStyle = border->GetBorderStyle(aSide);
}
if (borderStyle != NS_STYLE_BORDER_STYLE_NONE) {
const nsAFlatCString& style=
nsCSSProps::SearchKeywordTable(border->GetBorderStyle(aSide),
nsCSSProps::SearchKeywordTable(borderStyle,
nsCSSProps::kBorderStyleKTable);
val->SetString(style);
}
else {
val->SetString(NS_LITERAL_STRING(""));
val->SetString(NS_LITERAL_STRING("none"));
}
return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue),
(void **)&aValue);
return CallQueryInterface(val, &aValue);
}
nsresult

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

@ -711,18 +711,17 @@ nsComputedDOMStyle::GetCssFloat(nsIFrame *aFrame,
const nsStyleDisplay* display=nsnull;
GetStyleData(eStyleStruct_Display,(const nsStyleStruct*&)display,aFrame);
if(display) {
if(display && display->mFloats != NS_STYLE_FLOAT_NONE) {
const nsAFlatCString& cssFloat =
nsCSSProps::SearchKeywordTable(display->mFloats,
nsCSSProps::kFloatKTable);
nsCSSProps::kFloatKTable);
val->SetString(cssFloat);
}
else {
val->SetString(NS_LITERAL_STRING(""));
val->SetString(NS_LITERAL_STRING("none"));
}
return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue),
(void **)&aValue);
return CallQueryInterface(val, &aValue);
}
#if 0
@ -2841,11 +2840,11 @@ nsComputedDOMStyle::GetBorderWidthFor(PRUint8 aSide,
if(border) {
nsStyleCoord coord;
PRUint8 borderStyle = border->GetBorderStyle(aSide);
if (borderStyle == NS_STYLE_BORDER_STYLE_NONE) {
coord.SetCoordValue(0);
}
else {
PRUint8 borderStyle = border->GetBorderStyle(aSide);
if (borderStyle == NS_STYLE_BORDER_STYLE_NONE) {
coord.SetCoordValue(0);
}
else {
switch(aSide) {
case NS_SIDE_TOP:
border->mBorder.GetTop(coord); break;
@ -2976,18 +2975,23 @@ nsComputedDOMStyle::GetBorderStyleFor(PRUint8 aSide,
const nsStyleBorder* border = nsnull;
GetStyleData(eStyleStruct_Border, (const nsStyleStruct*&)border, aFrame);
if(border) {
PRUint8 borderStyle = NS_STYLE_BORDER_STYLE_NONE;
if (border) {
borderStyle = border->GetBorderStyle(aSide);
}
if (borderStyle != NS_STYLE_BORDER_STYLE_NONE) {
const nsAFlatCString& style=
nsCSSProps::SearchKeywordTable(border->GetBorderStyle(aSide),
nsCSSProps::SearchKeywordTable(borderStyle,
nsCSSProps::kBorderStyleKTable);
val->SetString(style);
}
else {
val->SetString(NS_LITERAL_STRING(""));
val->SetString(NS_LITERAL_STRING("none"));
}
return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue),
(void **)&aValue);
return CallQueryInterface(val, &aValue);
}
nsresult