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

Unified Diff: tests/FontConfigParser.cpp

Issue 446473003: Parser for new fonts.xml format (Closed) Base URL: https://skia.googlesource.com/skia.git@fcparse-lmp-2
Patch Set: Derek's review Created 6 years, 4 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
Index: tests/FontConfigParser.cpp
diff --git a/tests/FontConfigParser.cpp b/tests/FontConfigParser.cpp
index 78d01d95b90a602e42d49b527ef41da92531b1a3..4f64268c421c9012da4346bcca392cb7d5cbda3b 100644
--- a/tests/FontConfigParser.cpp
+++ b/tests/FontConfigParser.cpp
@@ -24,9 +24,26 @@ void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) {
#if SK_DEBUG_FONTS
for (int i = 0; i < fontFamilies.count(); ++i) {
SkDebugf("Family %d:\n", i);
+ switch(fontFamilies[i]->variant) {
+ case SkPaintOptionsAndroid::kElegant_Variant: SkDebugf(" elegant"); break;
+ case SkPaintOptionsAndroid::kCompact_Variant: SkDebugf(" compact"); break;
+ default: break;
+ }
+ if (!fontFamilies[i]->language.isEmpty()) {
+ SkDebugf(" language: %s", fontFamilies[i]->language.c_str());
+ }
for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) {
SkDebugf(" name %s\n", fontFamilies[i]->fNames[j].c_str());
}
+ for (int j = 0; j < fontFamilies[i]->fFontFiles.count(); ++j) {
+ const FontFileInfo& ffi = fontFamilies[i]->fFontFiles[j];
+ SkDebugf(" file (%d %s %d) %s\n",
+ ffi.weight,
+ ffi.fPaintOptions.getLanguage().getTag().isEmpty() ? "" :
+ ffi.fPaintOptions.getLanguage().getTag().c_str(),
+ ffi.fPaintOptions.getFontVariant(),
+ ffi.fFileName.c_str());
+ }
}
#endif // SK_DEBUG_FONTS
}
@@ -43,27 +60,26 @@ DEF_TEST(FontConfigParserAndroid, reporter) {
DumpLoadedFonts(preV17FontFamilies);
ValidateLoadedFonts(preV17FontFamilies, reporter);
+
djsollen 2014/08/05 19:44:08 extra space? If you were trying to provide separat
SkTDArray<FontFamily*> v17FontFamilies;
SkFontConfigParser::GetTestFontFamilies(v17FontFamilies,
GetResourcePath("android_fonts/v17/system_fonts.xml").c_str(),
GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str());
-
REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41);
DumpLoadedFonts(v17FontFamilies);
ValidateLoadedFonts(v17FontFamilies, reporter);
+
djsollen 2014/08/05 19:44:08 same here.
SkTDArray<FontFamily*> v22FontFamilies;
SkFontConfigParser::GetTestFontFamilies(v22FontFamilies,
GetResourcePath("android_fonts/v22/fonts.xml").c_str(),
NULL);
- //REPORTER_ASSERT(reporter, v22FontFamilies.count() > 0);
- if (v22FontFamilies.count() > 0) {
- REPORTER_ASSERT(reporter, v22FontFamilies[0]->fNames.count() > 0);
- }
+ REPORTER_ASSERT(reporter, v22FontFamilies.count() == 53);
- //ValidateLoadedFonts(v22FontFamilies, reporter);
+ DumpLoadedFonts(v22FontFamilies);
+ ValidateLoadedFonts(v22FontFamilies, reporter);
}
« src/ports/SkFontConfigParser_android.h ('K') | « src/ports/SkFontConfigParser_android.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698