aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_android.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2015-06-23 13:25:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-23 13:25:46 -0700
commitc53085413e0b4704aa89cc18396613d59e6ccb4d (patch)
tree757e7acbbc53a6c4516dda78cf753fe41807f72f /src/ports/SkFontMgr_android.cpp
parentd416a5b10ff9e6d4f55a1f5b0419722132d68ff3 (diff)
Rename SkFontConfigParser_android SkFontMgr_android_parser.
There are a number of files with 'FontConfig' in their names which just have to do with font configuration, but nothing to do with the FontConfig project or even with each other. This clarifies that these files deal with parsing for the Android font manager. Review URL: https://codereview.chromium.org/1200103008
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
-rw-r--r--src/ports/SkFontMgr_android.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
index f176b9cbec..f85539ca53 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();