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

added support for outline 

border color fixes
This commit is contained in:
peterl%netscape.com 1999-03-28 04:31:57 +00:00
Родитель 284405e9c7
Коммит 5b003c7782
3 изменённых файлов: 369 добавлений и 177 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1030,7 +1030,7 @@ nscoord CalcLength(const nsCSSValue& aValue,
NS_RELEASE(fm); NS_RELEASE(fm);
} }
else { else {
xHeight = ((aFont->mFont.size / 3) * 2); xHeight = ((aFont->mFont.size * 2) / 3);
} }
return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight); return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight);
} }
@ -1067,7 +1067,8 @@ nscoord CalcLength(const nsCSSValue& aValue,
#define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL) #define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL)
#define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH) #define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH)
#define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT)
#define SETCOORD_LEH (SETCOORD_LENGTH | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LE (SETCOORD_LENGTH | SETCOORD_ENUMERATED)
#define SETCOORD_LEH (SETCOORD_LE | SETCOORD_INHERIT)
#define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH)
static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord,
@ -1136,6 +1137,10 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor, nsc
result = PR_TRUE; result = PR_TRUE;
} }
} }
else if (eCSSUnit_Inherit == unit) {
aResult = aParentColor;
result = PR_TRUE;
}
return result; return result;
} }
@ -1525,9 +1530,6 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// color: color, string, inherit // color: color, string, inherit
if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) { if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) {
if (eCSSUnit_Inherit == ourColor->mColor.GetUnit()) {
color->mColor = parentColor->mColor;
}
} }
// cursor: enum, auto, url, inherit // cursor: enum, auto, url, inherit
@ -1549,17 +1551,17 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
// background-color: color, string, enum (flags), inherit // background-color: color, string, enum (flags), inherit
if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) { if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) { // do inherit first, so SetColor doesn't do it
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
else if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) {
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) { else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) {
color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) {
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
// background-image: url, none, inherit // background-image: url, none, inherit
if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) { if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) {
@ -1708,18 +1710,33 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// border-size: length, enum, inherit // border-size: length, enum, inherit
if (nsnull != ourMargin->mBorderWidth) { if (nsnull != ourMargin->mBorderWidth) {
nsStyleCoord coord; nsStyleCoord coord;
if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LEH, font, aPresContext)) { if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetLeft(coord); spacing->mBorder.SetLeft(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mLeft.GetUnit()) {
spacing->mBorder.SetLeft(parentSpacing->mBorder.GetLeft(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetTop(coord); spacing->mBorder.SetTop(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mTop.GetUnit()) {
spacing->mBorder.SetTop(parentSpacing->mBorder.GetTop(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetRight(coord); spacing->mBorder.SetRight(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mRight.GetUnit()) {
spacing->mBorder.SetRight(parentSpacing->mBorder.GetRight(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetBottom(coord); spacing->mBorder.SetBottom(coord);
} }
else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mBottom.GetUnit()) {
spacing->mBorder.SetBottom(parentSpacing->mBorder.GetBottom(coord));
}
} }
// border-style: enum, none, inhert // border-style: enum, none, inhert
@ -1766,61 +1783,108 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
} }
// border-color: color. string, enum, inherit // border-color: color, string, enum, inherit
if (nsnull != ourMargin->mBorderColor) { if (nsnull != ourMargin->mBorderColor) {
nsCSSRect* ourColor = ourMargin->mBorderColor; nsCSSRect* ourColor = ourMargin->mBorderColor;
nscolor aBorderColor = NS_RGBA(0,0,0,0); nscolor borderColor;
if (! SetColor(ourColor->mTop, parentSpacing->GetBorderColor(NS_SIDE_TOP), nscolor unused = NS_RGB(0,0,0);
aBorderColor)) {
if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP ,NS_RGBA(0, 0, 0, 0)); // transparent
}
else if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP, parentSpacing->GetBorderColor(NS_SIDE_TOP));
}
}
else{
spacing->SetBorderColor(NS_SIDE_TOP, aBorderColor);
}
if (! SetColor(ourColor->mRight, parentSpacing->GetBorderColor(NS_SIDE_RIGHT), if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_TOP, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) { spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
spacing->SetBorderColor(NS_SIDE_RIGHT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_RIGHT, parentSpacing->GetBorderColor(NS_SIDE_RIGHT)); spacing->SetBorderTransparent(NS_SIDE_TOP);
} }
} }
else{ else if (SetColor(ourColor->mTop, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_RIGHT, aBorderColor); spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_TOP);
}
if (! SetColor(ourColor->mBottom, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM), if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_RIGHT, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) { spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
spacing->SetBorderColor(NS_SIDE_BOTTOM ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_BOTTOM, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM)); spacing->SetBorderTransparent(NS_SIDE_RIGHT);
} }
} }
else{ else if (SetColor(ourColor->mRight, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_BOTTOM, aBorderColor); spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_RIGHT);
}
if (! SetColor(ourColor->mLeft, parentSpacing->GetBorderColor(NS_SIDE_LEFT), if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_BOTTOM, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) { spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
spacing->SetBorderColor(NS_SIDE_LEFT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_LEFT, parentSpacing->GetBorderColor(NS_SIDE_LEFT)); spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
} }
} }
else{ else if (SetColor(ourColor->mBottom, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, aBorderColor); spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
}
if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) {
if (parentSpacing->GetBorderColor(NS_SIDE_LEFT, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
else if (SetColor(ourColor->mLeft, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
// outline-width: length, enum, inherit
if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth,
SETCOORD_LE, font, aPresContext)) {
if (eCSSUnit_Inherit == ourMargin->mOutlineWidth.GetUnit()) {
spacing->mOutlineWidth = parentSpacing->mOutlineWidth;
}
}
// outline-color: color, string, enum, inherit
nscolor outlineColor;
nscolor unused = NS_RGB(0,0,0);
if (eCSSUnit_Inherit == ourMargin->mOutlineColor.GetUnit()) {
if (parentSpacing->GetOutlineColor(outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else {
spacing->SetOutlineInvert();
}
}
else if (SetColor(ourMargin->mOutlineColor, unused, outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else if (eCSSUnit_Enumerated == ourMargin->mOutlineColor.GetUnit()) {
spacing->SetOutlineInvert();
}
// outline-style: enum, none, inherit
if (eCSSUnit_Enumerated == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(ourMargin->mOutlineStyle.GetIntValue());
}
else if (eCSSUnit_None == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(NS_STYLE_BORDER_STYLE_NONE);
}
else if (eCSSUnit_Inherit == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(parentSpacing->GetOutlineStyle());
} }
} }
} }

182
layout/html/style/src/nsCSSStyleRule.cpp
Просмотреть файл

@ -1030,7 +1030,7 @@ nscoord CalcLength(const nsCSSValue& aValue,
NS_RELEASE(fm); NS_RELEASE(fm);
} }
else { else {
xHeight = ((aFont->mFont.size / 3) * 2); xHeight = ((aFont->mFont.size * 2) / 3);
} }
return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight); return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight);
} }
@ -1067,7 +1067,8 @@ nscoord CalcLength(const nsCSSValue& aValue,
#define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL) #define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL)
#define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH) #define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH)
#define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT)
#define SETCOORD_LEH (SETCOORD_LENGTH | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LE (SETCOORD_LENGTH | SETCOORD_ENUMERATED)
#define SETCOORD_LEH (SETCOORD_LE | SETCOORD_INHERIT)
#define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH)
static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord,
@ -1136,6 +1137,10 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor, nsc
result = PR_TRUE; result = PR_TRUE;
} }
} }
else if (eCSSUnit_Inherit == unit) {
aResult = aParentColor;
result = PR_TRUE;
}
return result; return result;
} }
@ -1525,9 +1530,6 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// color: color, string, inherit // color: color, string, inherit
if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) { if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) {
if (eCSSUnit_Inherit == ourColor->mColor.GetUnit()) {
color->mColor = parentColor->mColor;
}
} }
// cursor: enum, auto, url, inherit // cursor: enum, auto, url, inherit
@ -1549,17 +1551,17 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
// background-color: color, string, enum (flags), inherit // background-color: color, string, enum (flags), inherit
if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) { if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) { // do inherit first, so SetColor doesn't do it
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
else if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) {
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) { else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) {
color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) {
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
// background-image: url, none, inherit // background-image: url, none, inherit
if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) { if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) {
@ -1708,18 +1710,33 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// border-size: length, enum, inherit // border-size: length, enum, inherit
if (nsnull != ourMargin->mBorderWidth) { if (nsnull != ourMargin->mBorderWidth) {
nsStyleCoord coord; nsStyleCoord coord;
if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LEH, font, aPresContext)) { if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetLeft(coord); spacing->mBorder.SetLeft(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mLeft.GetUnit()) {
spacing->mBorder.SetLeft(parentSpacing->mBorder.GetLeft(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetTop(coord); spacing->mBorder.SetTop(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mTop.GetUnit()) {
spacing->mBorder.SetTop(parentSpacing->mBorder.GetTop(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetRight(coord); spacing->mBorder.SetRight(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mRight.GetUnit()) {
spacing->mBorder.SetRight(parentSpacing->mBorder.GetRight(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetBottom(coord); spacing->mBorder.SetBottom(coord);
} }
else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mBottom.GetUnit()) {
spacing->mBorder.SetBottom(parentSpacing->mBorder.GetBottom(coord));
}
} }
// border-style: enum, none, inhert // border-style: enum, none, inhert
@ -1766,61 +1783,108 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
} }
// border-color: color. string, enum, inherit // border-color: color, string, enum, inherit
if (nsnull != ourMargin->mBorderColor) { if (nsnull != ourMargin->mBorderColor) {
nsCSSRect* ourColor = ourMargin->mBorderColor; nsCSSRect* ourColor = ourMargin->mBorderColor;
nscolor aBorderColor = NS_RGBA(0,0,0,0); nscolor borderColor;
if (! SetColor(ourColor->mTop, parentSpacing->GetBorderColor(NS_SIDE_TOP), nscolor unused = NS_RGB(0,0,0);
aBorderColor)) {
if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP ,NS_RGBA(0, 0, 0, 0)); // transparent
}
else if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP, parentSpacing->GetBorderColor(NS_SIDE_TOP));
}
}
else{
spacing->SetBorderColor(NS_SIDE_TOP, aBorderColor);
}
if (! SetColor(ourColor->mRight, parentSpacing->GetBorderColor(NS_SIDE_RIGHT), if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_TOP, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) { spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
spacing->SetBorderColor(NS_SIDE_RIGHT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_RIGHT, parentSpacing->GetBorderColor(NS_SIDE_RIGHT)); spacing->SetBorderTransparent(NS_SIDE_TOP);
} }
} }
else{ else if (SetColor(ourColor->mTop, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_RIGHT, aBorderColor); spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_TOP);
}
if (! SetColor(ourColor->mBottom, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM), if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_RIGHT, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) { spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
spacing->SetBorderColor(NS_SIDE_BOTTOM ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_BOTTOM, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM)); spacing->SetBorderTransparent(NS_SIDE_RIGHT);
} }
} }
else{ else if (SetColor(ourColor->mRight, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_BOTTOM, aBorderColor); spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_RIGHT);
}
if (! SetColor(ourColor->mLeft, parentSpacing->GetBorderColor(NS_SIDE_LEFT), if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_BOTTOM, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) { spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
spacing->SetBorderColor(NS_SIDE_LEFT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_LEFT, parentSpacing->GetBorderColor(NS_SIDE_LEFT)); spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
} }
} }
else{ else if (SetColor(ourColor->mBottom, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, aBorderColor); spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
}
if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) {
if (parentSpacing->GetBorderColor(NS_SIDE_LEFT, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
else if (SetColor(ourColor->mLeft, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
// outline-width: length, enum, inherit
if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth,
SETCOORD_LE, font, aPresContext)) {
if (eCSSUnit_Inherit == ourMargin->mOutlineWidth.GetUnit()) {
spacing->mOutlineWidth = parentSpacing->mOutlineWidth;
}
}
// outline-color: color, string, enum, inherit
nscolor outlineColor;
nscolor unused = NS_RGB(0,0,0);
if (eCSSUnit_Inherit == ourMargin->mOutlineColor.GetUnit()) {
if (parentSpacing->GetOutlineColor(outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else {
spacing->SetOutlineInvert();
}
}
else if (SetColor(ourMargin->mOutlineColor, unused, outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else if (eCSSUnit_Enumerated == ourMargin->mOutlineColor.GetUnit()) {
spacing->SetOutlineInvert();
}
// outline-style: enum, none, inherit
if (eCSSUnit_Enumerated == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(ourMargin->mOutlineStyle.GetIntValue());
}
else if (eCSSUnit_None == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(NS_STYLE_BORDER_STYLE_NONE);
}
else if (eCSSUnit_Inherit == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(parentSpacing->GetOutlineStyle());
} }
} }
} }

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

@ -1030,7 +1030,7 @@ nscoord CalcLength(const nsCSSValue& aValue,
NS_RELEASE(fm); NS_RELEASE(fm);
} }
else { else {
xHeight = ((aFont->mFont.size / 3) * 2); xHeight = ((aFont->mFont.size * 2) / 3);
} }
return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight); return NSToCoordRound(aValue.GetFloatValue() * (float)xHeight);
} }
@ -1067,7 +1067,8 @@ nscoord CalcLength(const nsCSSValue& aValue,
#define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL) #define SETCOORD_LPFHN (SETCOORD_LPH | SETCOORD_FACTOR | SETCOORD_NORMAL)
#define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH) #define SETCOORD_LPAH (SETCOORD_LP | SETCOORD_AH)
#define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LPEH (SETCOORD_LP | SETCOORD_ENUMERATED | SETCOORD_INHERIT)
#define SETCOORD_LEH (SETCOORD_LENGTH | SETCOORD_ENUMERATED | SETCOORD_INHERIT) #define SETCOORD_LE (SETCOORD_LENGTH | SETCOORD_ENUMERATED)
#define SETCOORD_LEH (SETCOORD_LE | SETCOORD_INHERIT)
#define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH)
static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, static PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord,
@ -1136,6 +1137,10 @@ static PRBool SetColor(const nsCSSValue& aValue, const nscolor aParentColor, nsc
result = PR_TRUE; result = PR_TRUE;
} }
} }
else if (eCSSUnit_Inherit == unit) {
aResult = aParentColor;
result = PR_TRUE;
}
return result; return result;
} }
@ -1525,9 +1530,6 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// color: color, string, inherit // color: color, string, inherit
if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) { if (! SetColor(ourColor->mColor, parentColor->mColor, color->mColor)) {
if (eCSSUnit_Inherit == ourColor->mColor.GetUnit()) {
color->mColor = parentColor->mColor;
}
} }
// cursor: enum, auto, url, inherit // cursor: enum, auto, url, inherit
@ -1549,17 +1551,17 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
// background-color: color, string, enum (flags), inherit // background-color: color, string, enum (flags), inherit
if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) { if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) { // do inherit first, so SetColor doesn't do it
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
else if (SetColor(ourColor->mBackColor, parentColor->mBackgroundColor, color->mBackgroundColor)) {
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) { else if (eCSSUnit_Enumerated == ourColor->mBackColor.GetUnit()) {
color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT; color->mBackgroundFlags |= NS_STYLE_BG_COLOR_TRANSPARENT;
} }
else if (eCSSUnit_Inherit == ourColor->mBackColor.GetUnit()) {
color->mBackgroundColor = parentColor->mBackgroundColor;
color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
color->mBackgroundFlags |= (parentColor->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
}
// background-image: url, none, inherit // background-image: url, none, inherit
if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) { if (eCSSUnit_URL == ourColor->mBackImage.GetUnit()) {
@ -1708,18 +1710,33 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
// border-size: length, enum, inherit // border-size: length, enum, inherit
if (nsnull != ourMargin->mBorderWidth) { if (nsnull != ourMargin->mBorderWidth) {
nsStyleCoord coord; nsStyleCoord coord;
if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LEH, font, aPresContext)) { if (SetCoord(ourMargin->mBorderWidth->mLeft, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetLeft(coord); spacing->mBorder.SetLeft(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mLeft.GetUnit()) {
spacing->mBorder.SetLeft(parentSpacing->mBorder.GetLeft(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mTop, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetTop(coord); spacing->mBorder.SetTop(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mTop.GetUnit()) {
spacing->mBorder.SetTop(parentSpacing->mBorder.GetTop(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mRight, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetRight(coord); spacing->mBorder.SetRight(coord);
} }
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LEH, font, aPresContext)) { else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mRight.GetUnit()) {
spacing->mBorder.SetRight(parentSpacing->mBorder.GetRight(coord));
}
if (SetCoord(ourMargin->mBorderWidth->mBottom, coord, SETCOORD_LE, font, aPresContext)) {
spacing->mBorder.SetBottom(coord); spacing->mBorder.SetBottom(coord);
} }
else if (eCSSUnit_Inherit == ourMargin->mBorderWidth->mBottom.GetUnit()) {
spacing->mBorder.SetBottom(parentSpacing->mBorder.GetBottom(coord));
}
} }
// border-style: enum, none, inhert // border-style: enum, none, inhert
@ -1766,61 +1783,108 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
} }
} }
// border-color: color. string, enum, inherit // border-color: color, string, enum, inherit
if (nsnull != ourMargin->mBorderColor) { if (nsnull != ourMargin->mBorderColor) {
nsCSSRect* ourColor = ourMargin->mBorderColor; nsCSSRect* ourColor = ourMargin->mBorderColor;
nscolor aBorderColor = NS_RGBA(0,0,0,0); nscolor borderColor;
if (! SetColor(ourColor->mTop, parentSpacing->GetBorderColor(NS_SIDE_TOP), nscolor unused = NS_RGB(0,0,0);
aBorderColor)) {
if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP ,NS_RGBA(0, 0, 0, 0)); // transparent
}
else if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
spacing->SetBorderColor(NS_SIDE_TOP, parentSpacing->GetBorderColor(NS_SIDE_TOP));
}
}
else{
spacing->SetBorderColor(NS_SIDE_TOP, aBorderColor);
}
if (! SetColor(ourColor->mRight, parentSpacing->GetBorderColor(NS_SIDE_RIGHT), if (eCSSUnit_Inherit == ourColor->mTop.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_TOP, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) { spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
spacing->SetBorderColor(NS_SIDE_RIGHT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_RIGHT, parentSpacing->GetBorderColor(NS_SIDE_RIGHT)); spacing->SetBorderTransparent(NS_SIDE_TOP);
} }
} }
else{ else if (SetColor(ourColor->mTop, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_RIGHT, aBorderColor); spacing->SetBorderColor(NS_SIDE_TOP, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mTop.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_TOP);
}
if (! SetColor(ourColor->mBottom, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM), if (eCSSUnit_Inherit == ourColor->mRight.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_RIGHT, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) { spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
spacing->SetBorderColor(NS_SIDE_BOTTOM ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_BOTTOM, parentSpacing->GetBorderColor(NS_SIDE_BOTTOM)); spacing->SetBorderTransparent(NS_SIDE_RIGHT);
} }
} }
else{ else if (SetColor(ourColor->mRight, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_BOTTOM, aBorderColor); spacing->SetBorderColor(NS_SIDE_RIGHT, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mRight.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_RIGHT);
}
if (! SetColor(ourColor->mLeft, parentSpacing->GetBorderColor(NS_SIDE_LEFT), if (eCSSUnit_Inherit == ourColor->mBottom.GetUnit()) {
aBorderColor)) { if (parentSpacing->GetBorderColor(NS_SIDE_BOTTOM, borderColor)) {
if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) { spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
spacing->SetBorderColor(NS_SIDE_LEFT ,NS_RGBA(0, 0, 0, 0)); // transparent
} }
else if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) { else {
spacing->SetBorderColor(NS_SIDE_LEFT, parentSpacing->GetBorderColor(NS_SIDE_LEFT)); spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
} }
} }
else{ else if (SetColor(ourColor->mBottom, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, aBorderColor); spacing->SetBorderColor(NS_SIDE_BOTTOM, borderColor);
} }
else if (eCSSUnit_Enumerated == ourColor->mBottom.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_BOTTOM);
}
if (eCSSUnit_Inherit == ourColor->mLeft.GetUnit()) {
if (parentSpacing->GetBorderColor(NS_SIDE_LEFT, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
else if (SetColor(ourColor->mLeft, unused, borderColor)) {
spacing->SetBorderColor(NS_SIDE_LEFT, borderColor);
}
else if (eCSSUnit_Enumerated == ourColor->mLeft.GetUnit()) {
spacing->SetBorderTransparent(NS_SIDE_LEFT);
}
}
// outline-width: length, enum, inherit
if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth,
SETCOORD_LE, font, aPresContext)) {
if (eCSSUnit_Inherit == ourMargin->mOutlineWidth.GetUnit()) {
spacing->mOutlineWidth = parentSpacing->mOutlineWidth;
}
}
// outline-color: color, string, enum, inherit
nscolor outlineColor;
nscolor unused = NS_RGB(0,0,0);
if (eCSSUnit_Inherit == ourMargin->mOutlineColor.GetUnit()) {
if (parentSpacing->GetOutlineColor(outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else {
spacing->SetOutlineInvert();
}
}
else if (SetColor(ourMargin->mOutlineColor, unused, outlineColor)) {
spacing->SetOutlineColor(outlineColor);
}
else if (eCSSUnit_Enumerated == ourMargin->mOutlineColor.GetUnit()) {
spacing->SetOutlineInvert();
}
// outline-style: enum, none, inherit
if (eCSSUnit_Enumerated == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(ourMargin->mOutlineStyle.GetIntValue());
}
else if (eCSSUnit_None == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(NS_STYLE_BORDER_STYLE_NONE);
}
else if (eCSSUnit_Inherit == ourMargin->mOutlineStyle.GetUnit()) {
spacing->SetOutlineStyle(parentSpacing->GetOutlineStyle());
} }
} }
} }