зеркало из https://github.com/mozilla/gecko-dev.git
Fix #12737 "-moz-fixed should be compat mode only". Overwrites the fixed font family with the normal font family in navQuirks mode only. r=pollmann.
This commit is contained in:
Родитель
f460a870ed
Коммит
bfe52a8e4e
|
@ -226,7 +226,11 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes,
|
|||
font->mFlags |= NS_STYLE_FONT_USE_FIXED;
|
||||
}
|
||||
else {
|
||||
font->mFixedFont.name = familyList;
|
||||
nsCompatibility mode;
|
||||
aPresContext->GetCompatibilityMode(&mode);
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
font->mFixedFont.name = familyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -1279,7 +1279,11 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
|
|||
font->mFlags |= NS_STYLE_FONT_USE_FIXED;
|
||||
}
|
||||
else {
|
||||
font->mFixedFont.name = familyList;
|
||||
nsCompatibility mode;
|
||||
aPresContext->GetCompatibilityMode(&mode);
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
font->mFixedFont.name = familyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -226,7 +226,11 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes,
|
|||
font->mFlags |= NS_STYLE_FONT_USE_FIXED;
|
||||
}
|
||||
else {
|
||||
font->mFixedFont.name = familyList;
|
||||
nsCompatibility mode;
|
||||
aPresContext->GetCompatibilityMode(&mode);
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
font->mFixedFont.name = familyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -1279,7 +1279,11 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
|
|||
font->mFlags |= NS_STYLE_FONT_USE_FIXED;
|
||||
}
|
||||
else {
|
||||
font->mFixedFont.name = familyList;
|
||||
nsCompatibility mode;
|
||||
aPresContext->GetCompatibilityMode(&mode);
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
font->mFixedFont.name = familyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -1279,7 +1279,11 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
|
|||
font->mFlags |= NS_STYLE_FONT_USE_FIXED;
|
||||
}
|
||||
else {
|
||||
font->mFixedFont.name = familyList;
|
||||
nsCompatibility mode;
|
||||
aPresContext->GetCompatibilityMode(&mode);
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
font->mFixedFont.name = familyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
Загрузка…
Ссылка в новой задаче