| Index: src/ports/SkFontMgr_android.cpp
|
| diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
|
| index 11f944997111e1b12ed972758e0ea89d1bf81fa2..d23e187c7f0e0803141148233b39eed6406e0e89 100644
|
| --- a/src/ports/SkFontMgr_android.cpp
|
| +++ b/src/ports/SkFontMgr_android.cpp
|
| @@ -247,8 +247,8 @@ public:
|
| SkTDArray<FontFamily*> families;
|
| if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem != custom->fSystemFontUse) {
|
| SkString base(custom->fBasePath);
|
| - SkFontConfigParser::GetCustomFontFamilies(families, base,
|
| - custom->fFontsXml, custom->fFallbackFontsXml);
|
| + SkFontConfigParser::GetCustomFontFamilies(
|
| + families, base, custom->fFontsXml, custom->fFallbackFontsXml, NULL);
|
| }
|
| if (!custom ||
|
| (custom && SkFontMgr_Android_CustomFonts::kOnlyCustom != custom->fSystemFontUse))
|
| @@ -257,8 +257,8 @@ public:
|
| }
|
| if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem == custom->fSystemFontUse) {
|
| SkString base(custom->fBasePath);
|
| - SkFontConfigParser::GetCustomFontFamilies(families, base,
|
| - custom->fFontsXml, custom->fFallbackFontsXml);
|
| + SkFontConfigParser::GetCustomFontFamilies(
|
| + families, base, custom->fFontsXml, custom->fFallbackFontsXml, NULL);
|
| }
|
| this->buildNameToFamilyMap(families);
|
| this->findDefaultFont();
|
|
|