| Index: src/ports/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
|
| index 815d9f966a890b95b2a9de6fb7674814944db18b..d7570d9354bc9a8ea9284241f1b3e305ae6b6c93 100644
|
| --- a/src/ports/SkFontMgr_fontconfig.cpp
|
| +++ b/src/ports/SkFontMgr_fontconfig.cpp
|
| @@ -452,7 +452,6 @@
|
| class SkFontMgr_fontconfig : public SkFontMgr {
|
| mutable SkAutoFcConfig fFC;
|
| SkAutoTUnref<SkDataTable> fFamilyNames;
|
| - SkTypeface_FreeType::Scanner fScanner;
|
|
|
| class StyleSet : public SkFontStyleSet {
|
| public:
|
| @@ -828,7 +827,7 @@
|
|
|
| SkFontStyle style;
|
| bool isFixedWidth = false;
|
| - if (!fScanner.scanFont(stream, ttcIndex, NULL, &style, &isFixedWidth)) {
|
| + if (!SkTypeface_FreeType::ScanFont(stream, ttcIndex, NULL, &style, &isFixedWidth)) {
|
| return NULL;
|
| }
|
|
|
|
|