wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 280443 p5 - fixup problem with MathML stretchy fallback. r=fredw

Browse Source
This commit is contained in:
John Daggett 2014-06-06 15:09:24 +09:00
parent 57d2b886ba
commit be68cb997f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/gfxFontFamilyList.h
View File

@ -277,7 +277,7 @@ public:
if (!aFamilyList.IsEmpty()) {
aFamilyList.Append(',');
}
if (mDefaultFontType != eFamily_serif) {
if (mDefaultFontType == eFamily_serif) {
aFamilyList.AppendLiteral("serif");
} else {
aFamilyList.AppendLiteral("sans-serif");

10
layout/mathml/nsMathMLChar.cpp
View File

@ -1406,6 +1406,12 @@ nsMathMLChar::StretchEnumContext::EnumCallback(const FontFamilyName& aFamily,
{
StretchEnumContext* context = static_cast<StretchEnumContext*>(aData);
// for comparisons, force use of unquoted names
FontFamilyName unquotedFamilyName(aFamily);
if (unquotedFamilyName.mType == eFamily_named_quoted) {
unquotedFamilyName.mType = eFamily_named;
}
// Check font family if it is not a generic one
// We test with the kNullGlyph
nsStyleContext *sc = context->mChar->mStyleContext;
@ -1413,7 +1419,7 @@ nsMathMLChar::StretchEnumContext::EnumCallback(const FontFamilyName& aFamily,
NormalizeDefaultFont(font);
nsRefPtr<gfxFontGroup> fontGroup;
FontFamilyList family;
family.Append(aFamily);
family.Append(unquotedFamilyName);
if (!aGeneric && !context->mChar->SetFontFamily(context->mPresContext,
nullptr, kNullGlyph, family,
font, &fontGroup))
@ -1434,7 +1440,7 @@ nsMathMLChar::StretchEnumContext::EnumCallback(const FontFamilyName& aFamily,
// Otherwise try to find a .properties file corresponding to that font
// family or fallback to the Unicode table.
nsAutoString familyName;
aFamily.AppendToString(familyName);
unquotedFamilyName.AppendToString(familyName);
glyphTable = gGlyphTableList->GetGlyphTableFor(familyName);
}
}