Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-20 08:51:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1261699 - preserve user fontconfig autohint settings in Cairo glyph rendering options. r=jfkthame

Browse Source
This commit is contained in:
Lee Salzman 2016-04-21 11:50:08 -04:00
parent cb9bfa1888
commit 47a00ac080
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/thebes/gfxFcPlatformFontList.cpp
View File

@ -733,10 +733,16 @@ gfxFontconfigFontEntry::CreateFontInstance(const gfxFontStyle *aFontStyle,
nsAutoRef<FcPattern> renderPattern
(FcFontRenderPrepare(nullptr, pattern, mFontPattern));
FcBool autohint;
if (FcPatternGetBool(renderPattern, FC_AUTOHINT, 0, &autohint) != FcResultMatch) {
autohint = FcFalse;
}
cairo_scaled_font_t* scaledFont =
CreateScaledFont(renderPattern, aFontStyle, aNeedsBold);
gfxFont* newFont =
new gfxFontconfigFont(scaledFont, this, aFontStyle, aNeedsBold);
new gfxFontconfigFont(scaledFont, this, aFontStyle, aNeedsBold,
bool(autohint));
cairo_scaled_font_destroy(scaledFont);
return newFont;
@ -850,8 +856,10 @@ gfxFontconfigFontFamily::AddFontPattern(FcPattern* aFontPattern)
gfxFontconfigFont::gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle,
bool aNeedsBold) :
gfxFT2FontBase(aScaledFont, aFontEntry, aFontStyle)
bool aNeedsBold,
bool aAutoHinting) :
gfxFT2FontBase(aScaledFont, aFontEntry, aFontStyle),
mAutoHinting(aAutoHinting)
{
}
@ -876,9 +884,10 @@ gfxFontconfigFont::GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams)
mozilla::gfx::AntialiasMode aaMode =
mozilla::gfx::CairoAntialiasToGfxAntialias(antialias);
// We don't want to force the use of the autohinter over the font's built in hints
bool autohint = GetAutoHinting();
// The fontconfig AA mode must be passed along because it may override the hinting style.
return mozilla::gfx::Factory::CreateCairoGlyphRenderingOptions(hinting, false, aaMode);
return mozilla::gfx::Factory::CreateCairoGlyphRenderingOptions(hinting, autohint, aaMode);
}
#endif

8
gfx/thebes/gfxFcPlatformFontList.h
View File

@ -182,7 +182,10 @@ public:
gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle,
bool aNeedsBold);
bool aNeedsBold,
bool aAutoHinting = false);
bool GetAutoHinting() const { return mAutoHinting; }
#ifdef USE_SKIA
virtual already_AddRefed<mozilla::gfx::GlyphRenderingOptions>
@ -191,6 +194,9 @@ public:
protected:
virtual ~gfxFontconfigFont();
private:
bool mAutoHinting;
};
class nsILanguageAtomService;