4b86bacb04
This removes the code which forces 400 and 700 weights only, and also overrides the font weight with the configured weight. Review URL: https://codereview.chromium.org/694533006
115 lines
4.1 KiB
C++
115 lines
4.1 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Resources.h"
|
|
#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, const char* firstExpectedFile,
|
|
skiatest::Reporter* reporter) {
|
|
REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5);
|
|
REPORTER_ASSERT(reporter, !strcmp(fontFamilies[0]->fNames[0].c_str(), "sans-serif"));
|
|
REPORTER_ASSERT(reporter,
|
|
!strcmp(fontFamilies[0]->fFonts[0].fFileName.c_str(), firstExpectedFile));
|
|
REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont);
|
|
}
|
|
|
|
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]->fVariant) {
|
|
case SkPaintOptionsAndroid::kElegant_Variant: SkDebugf(" elegant"); break;
|
|
case SkPaintOptionsAndroid::kCompact_Variant: SkDebugf(" compact"); break;
|
|
default: break;
|
|
}
|
|
if (!fontFamilies[i]->fLanguage.getTag().isEmpty()) {
|
|
SkDebugf(" language: %s", fontFamilies[i]->fLanguage.getTag().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]->fFonts.count(); ++j) {
|
|
const FontFileInfo& ffi = fontFamilies[i]->fFonts[j];
|
|
SkDebugf(" file (%d %s %d) %s\n",
|
|
ffi.fWeight,
|
|
ffi.fPaintOptions.getLanguage().getTag().isEmpty() ? "" :
|
|
ffi.fPaintOptions.getLanguage().getTag().c_str(),
|
|
ffi.fPaintOptions.getFontVariant(),
|
|
ffi.fFileName.c_str());
|
|
}
|
|
}
|
|
#endif // SK_DEBUG_FONTS
|
|
}
|
|
|
|
DEF_TEST(FontConfigParserAndroid, reporter) {
|
|
|
|
bool resourcesMissing = false;
|
|
|
|
SkTDArray<FontFamily*> preV17FontFamilies;
|
|
SkFontConfigParser::GetTestFontFamilies(preV17FontFamilies,
|
|
GetResourcePath("android_fonts/pre_v17/system_fonts.xml").c_str(),
|
|
GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str());
|
|
|
|
if (preV17FontFamilies.count() > 0) {
|
|
REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14);
|
|
REPORTER_ASSERT(reporter, CountFallbacks(preV17FontFamilies) == 10);
|
|
|
|
DumpLoadedFonts(preV17FontFamilies);
|
|
ValidateLoadedFonts(preV17FontFamilies, "Roboto-Regular.ttf", reporter);
|
|
} else {
|
|
resourcesMissing = true;
|
|
}
|
|
|
|
|
|
SkTDArray<FontFamily*> v17FontFamilies;
|
|
SkFontConfigParser::GetTestFontFamilies(v17FontFamilies,
|
|
GetResourcePath("android_fonts/v17/system_fonts.xml").c_str(),
|
|
GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str());
|
|
|
|
if (v17FontFamilies.count() > 0) {
|
|
REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41);
|
|
REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 31);
|
|
|
|
DumpLoadedFonts(v17FontFamilies);
|
|
ValidateLoadedFonts(v17FontFamilies, "Roboto-Regular.ttf", reporter);
|
|
} else {
|
|
resourcesMissing = true;
|
|
}
|
|
|
|
|
|
SkTDArray<FontFamily*> v22FontFamilies;
|
|
SkFontConfigParser::GetTestFontFamilies(v22FontFamilies,
|
|
GetResourcePath("android_fonts/v22/fonts.xml").c_str(),
|
|
NULL);
|
|
|
|
if (v22FontFamilies.count() > 0) {
|
|
REPORTER_ASSERT(reporter, v22FontFamilies.count() == 53);
|
|
REPORTER_ASSERT(reporter, CountFallbacks(v22FontFamilies) == 42);
|
|
|
|
DumpLoadedFonts(v22FontFamilies);
|
|
ValidateLoadedFonts(v22FontFamilies, "Roboto-Thin.ttf", reporter);
|
|
} else {
|
|
resourcesMissing = true;
|
|
}
|
|
|
|
if (resourcesMissing) {
|
|
SkDebugf("---- Resource files missing for FontConfigParser test\n");
|
|
}
|
|
}
|
|
|