Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Unified Diff: src/ports/SkFontMgr_android.cpp

Issue 1200103008: Rename SkFontConfigParser_android SkFontMgr_android_parser. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update test name and exclusion. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ports/SkFontConfigParser_android.cpp ('k') | src/ports/SkFontMgr_android_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « src/ports/SkFontConfigParser_android.cpp ('k') | src/ports/SkFontMgr_android_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698