diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-31 17:37:31 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-31 17:37:31 +0000 |
| commit | e027a6ed9b9e2a96be846ddefb2b06e350858eed (patch) | |
| tree | 5bcc3580a1e462ad720a4767eb45256e30ff3d31 /src/fonts | |
| parent | caacc8f4e1ff69d545fb55c2a0a1d46e5cdbae3f (diff) | |
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
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkFontMgr_fontconfig.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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() { |