diff options
| -rw-r--r-- | src/ports/SkFontConfigParser_android.cpp | 5 | ||||
| -rw-r--r-- | tests/FontConfigParser.cpp | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/ports/SkFontConfigParser_android.cpp b/src/ports/SkFontConfigParser_android.cpp index 6e8727048d..e9c912f4b0 100644 --- a/src/ports/SkFontConfigParser_android.cpp +++ b/src/ports/SkFontConfigParser_android.cpp @@ -91,7 +91,9 @@ namespace lmpParser { void familyElementHandler(FontFamily* family, const char** attributes) { // A non-fallback <family> tag must have a canonical name attribute. - // A (fallback) <family> tag may have lang and variant attributes. + // A fallback <family> tag has no name, and may have lang and variant + // attributes. + family->fIsFallbackFont = true; for (size_t i = 0; attributes[i] != NULL && attributes[i+1] != NULL; i += 2) { const char* name = attributes[i]; @@ -101,6 +103,7 @@ void familyElementHandler(FontFamily* family, const char** attributes) { if (nameLen == 4 && !strncmp("name", name, nameLen)) { SkAutoAsciiToLC tolc(value); family->fNames.push_back().set(tolc.lc()); + family->fIsFallbackFont = false; } else if (nameLen == 4 && !strncmp("lang", name, nameLen)) { family->fLanguage = SkLanguage (value); } else if (nameLen == 7 && !strncmp("variant", name, nameLen)) { diff --git a/tests/FontConfigParser.cpp b/tests/FontConfigParser.cpp index 8ca7556df1..86b2b1db90 100644 --- a/tests/FontConfigParser.cpp +++ b/tests/FontConfigParser.cpp @@ -9,6 +9,16 @@ #include "SkFontConfigParser_android.h" #include "Test.h" +int CountFallbacks(SkTDArray<FontFamily*> fontFamilies) { + int countOfFallbackFonts = 0; + for (int i = 0; i < fontFamilies.count(); i++) { + if (fontFamilies[i]->fIsFallbackFont) { + countOfFallbackFonts++; + } + } + return countOfFallbackFonts; +} + void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies, skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5); @@ -17,7 +27,6 @@ void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies, !strcmp(fontFamilies[0]->fFonts[0].fFileName.c_str(), "Roboto-Regular.ttf")); REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont); - } void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) { @@ -59,6 +68,7 @@ DEF_TEST(FontConfigParserAndroid, reporter) { if (preV17FontFamilies.count() > 0) { REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14); + REPORTER_ASSERT(reporter, CountFallbacks(preV17FontFamilies) == 10); DumpLoadedFonts(preV17FontFamilies); ValidateLoadedFonts(preV17FontFamilies, reporter); @@ -74,6 +84,7 @@ DEF_TEST(FontConfigParserAndroid, reporter) { if (v17FontFamilies.count() > 0) { REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41); + REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 31); DumpLoadedFonts(v17FontFamilies); ValidateLoadedFonts(v17FontFamilies, reporter); @@ -89,6 +100,7 @@ DEF_TEST(FontConfigParserAndroid, reporter) { if (v22FontFamilies.count() > 0) { REPORTER_ASSERT(reporter, v22FontFamilies.count() == 53); + REPORTER_ASSERT(reporter, CountFallbacks(v22FontFamilies) == 42); DumpLoadedFonts(v22FontFamilies); ValidateLoadedFonts(v22FontFamilies, reporter); |