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 919845 - Really make Fira Sans the default font, r=jfkthame

Browse Source
This commit is contained in:
Michael Wu 2013-09-24 10:57:25 -07:00
parent a5ac64267c
commit e0bf783168
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/thebes/gfxFT2FontList.cpp
View File

@ -1426,7 +1426,12 @@ gfxFT2FontList::GetDefaultFont(const gfxFontStyle* aStyle)
return FindFamily(resolvedName);
}
}
#elif defined(ANDROID)
#elif defined(MOZ_WIDGET_GONK)
nsAutoString resolvedName;
if (ResolveFontName(NS_LITERAL_STRING("Fira Sans OT"), resolvedName)) {
return FindFamily(resolvedName);
}
#elif defined(MOZ_WIDGET_ANDROID)
nsAutoString resolvedName;
if (ResolveFontName(NS_LITERAL_STRING("Roboto"), resolvedName) ||
ResolveFontName(NS_LITERAL_STRING("Droid Sans"), resolvedName)) {

2
layout/reftests/canvas/reftest.list
View File

@ -43,7 +43,7 @@ fuzzy-if(azureSkiaGL,10,400) == text-not-in-doc-test.html text-not-in-doc-ref.ht
!= text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
== text-bidi-rtl-test.html text-bidi-rtl-ref.html
!= text-font-lang.html text-font-lang-notref.html
skip-if(B2G) != text-font-lang.html text-font-lang-notref.html
== text-measure.html text-measure-ref.html

2
widget/gonk/nsLookAndFeel.cpp
View File

@ -420,7 +420,7 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
gfxFontStyle& aFontStyle,
float aDevPixPerCSSPixel)
{
aFontName.AssignLiteral("\"Fira Sans\"");
aFontName.AssignLiteral("\"Fira Sans OT\"");
aFontStyle.style = NS_FONT_STYLE_NORMAL;
aFontStyle.weight = NS_FONT_WEIGHT_NORMAL;
aFontStyle.stretch = NS_FONT_STRETCH_NORMAL;