| Index: src/fonts/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp
|
| index c56e065509fffacd0359cdaa534e27b0fa320c5b..4f99a6f5c1f98d16c22b2af0be1aa05943438502 100644
|
| --- a/src/fonts/SkFontMgr_fontconfig.cpp
|
| +++ b/src/fonts/SkFontMgr_fontconfig.cpp
|
| @@ -214,7 +214,7 @@ SkTypeface* SkFontStyleSet_FC::matchStyle(const SkFontStyle& pattern) {
|
| class SkFontMgr_fontconfig : public SkFontMgr {
|
| SkAutoTUnref<SkFontConfigInterface> fFCI;
|
| SkDataTable* fFamilyNames;
|
| -
|
| + SkTypeface_FreeType::Scanner fScanner;
|
|
|
| public:
|
| SkFontMgr_fontconfig(SkFontConfigInterface* fci)
|
| @@ -302,7 +302,7 @@ protected:
|
| // TODO should the caller give us the style or should we get it from freetype?
|
| SkFontStyle style;
|
| bool isFixedWidth = false;
|
| - if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) {
|
| + if (!fScanner.scanFont(stream, 0, NULL, &style, &isFixedWidth)) {
|
| return NULL;
|
| }
|
|
|
|
|