Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#30127 "-moz-fixed not friendly with the cascade". Inherit NS_STYLE_FONT_USE_FIXED together with the font face.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@62901 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com
2000-03-14 07:30:29 +00:00
parent 298feb2cbb
commit ed6f7b2bac
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {
font->mFont.name = parentFont->mFont.name;
font->mFixedFont.name = parentFont->mFixedFont.name;
font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT;
font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT);
font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED);
font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED));
}
// font-style: enum, normal, inherit

4
mozilla/layout/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {
font->mFont.name = parentFont->mFont.name;
font->mFixedFont.name = parentFont->mFixedFont.name;
font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT;
font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT);
font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED);
font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED));
}
// font-style: enum, normal, inherit

4
mozilla/layout/style/nsCSSStyleRule.cpp
View File

@@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {
font->mFont.name = parentFont->mFont.name;
font->mFixedFont.name = parentFont->mFixedFont.name;
font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT;
font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT);
font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED);
font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED));
}
// font-style: enum, normal, inherit