Index: src/ports/SkFontMgr_android.cpp |
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp |
index f176b9cbecbd68c3346628a7d0708fea14a3a638..f85539ca53603c90b8196ef7a6285914177445c2 100644 |
--- a/src/ports/SkFontMgr_android.cpp |
+++ b/src/ports/SkFontMgr_android.cpp |
@@ -5,11 +5,11 @@ |
* found in the LICENSE file. |
*/ |
-#include "SkFontConfigParser_android.h" |
#include "SkFontDescriptor.h" |
#include "SkFontHost_FreeType_common.h" |
#include "SkFontMgr.h" |
#include "SkFontMgr_android.h" |
+#include "SkFontMgr_android_parser.h" |
#include "SkFontStyle.h" |
#include "SkStream.h" |
#include "SkTDArray.h" |
@@ -305,18 +305,18 @@ public: |
SkTDArray<FontFamily*> families; |
if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem != custom->fSystemFontUse) { |
SkString base(custom->fBasePath); |
- SkFontConfigParser::GetCustomFontFamilies(families, base, |
- custom->fFontsXml, custom->fFallbackFontsXml); |
+ SkFontMgr_Android_Parser::GetCustomFontFamilies( |
+ families, base, custom->fFontsXml, custom->fFallbackFontsXml); |
} |
if (!custom || |
(custom && SkFontMgr_Android_CustomFonts::kOnlyCustom != custom->fSystemFontUse)) |
{ |
- SkFontConfigParser::GetSystemFontFamilies(families); |
+ SkFontMgr_Android_Parser::GetSystemFontFamilies(families); |
} |
if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem == custom->fSystemFontUse) { |
SkString base(custom->fBasePath); |
- SkFontConfigParser::GetCustomFontFamilies(families, base, |
- custom->fFontsXml, custom->fFallbackFontsXml); |
+ SkFontMgr_Android_Parser::GetCustomFontFamilies( |
+ families, base, custom->fFontsXml, custom->fFallbackFontsXml); |
} |
this->buildNameToFamilyMap(families); |
this->findDefaultFont(); |