From e027a6ed9b9e2a96be846ddefb2b06e350858eed Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 31 Jul 2013 17:37:31 +0000 Subject: adapt FontConfig to use SK_FONTHOST_USES_FONTMGR BUG= Review URL: https://codereview.chromium.org/21331003 git-svn-id: http://skia.googlecode.com/svn/trunk@10463 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/fonts/SkFontMgr_fontconfig.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/fonts') diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index a78575262f..1c87a72f06 100644 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ b/src/fonts/SkFontMgr_fontconfig.cpp @@ -8,6 +8,7 @@ #include "SkFontMgr.h" #include "SkFontStyle.h" #include "SkFontConfigInterface.h" +#include "SkFontConfigTypeface.h" #include "SkMath.h" #include "SkString.h" #include "SkTDArray.h" @@ -267,6 +268,12 @@ protected: virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) { return NULL; } + + virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], + unsigned styleBits) SK_OVERRIDE { + return FontConfigTypeface::LegacyCreateTypeface(NULL, familyName, + (SkTypeface::Style)styleBits); + } }; SkFontMgr* SkFontMgr::Factory() { -- cgit v1.2.3