diff options
| author |  bungeman <bungeman@google.com> | 2016-04-27 10:21:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-27 10:21:05 -0700 |
| commit | b4bb7d825566042ed64697be49457dbac060e6c4 (patch) | |
| tree | baad2b4f5125674cc06c06a7d2dd04f7100379c4 /tests/FontMgrTest.cpp | |
| parent | 12135f50bd8d7d8abbb2befb99a9784043cb90e5 (diff) | |
Add oblique as a slant.
Some fonts have italic and oblique in the same family, see
http://lucidafonts.com/fonts/family/lucida-sans
http://www.gust.org.pl/projects/e-foundry/latin-modern
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1921903002
Chromium side change at https://crrev.com/1921503006/ .
Review-Url: https://codereview.chromium.org/1921903002
Diffstat (limited to 'tests/FontMgrTest.cpp')
| -rw-r--r-- | tests/FontMgrTest.cpp | 68 |
1 files changed, 66 insertions, 2 deletions
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp index 96af746ace..92dc18b135 100644 --- a/tests/FontMgrTest.cpp +++ b/tests/FontMgrTest.cpp @@ -110,7 +110,7 @@ static void test_fontiter(skiatest::Reporter* reporter, bool verbose) { if (verbose) { SkDebugf("\t[%d] %s [%3d %d %d]\n", j, sname.c_str(), - fs.weight(), fs.width(), fs.isItalic()); + fs.weight(), fs.width(), fs.slant()); } } } @@ -185,10 +185,14 @@ static void test_matchStyleCSS3(skiatest::Reporter* reporter) { SkFontStyle condensed_normal_900(SkFontStyle::kBlack_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kUpright_Slant); SkFontStyle condensed_italic_100(SkFontStyle::kThin_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kItalic_Slant); SkFontStyle condensed_italic_900(SkFontStyle::kBlack_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kItalic_Slant); + SkFontStyle condensed_obliqu_100(SkFontStyle::kThin_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kOblique_Slant); + SkFontStyle condensed_obliqu_900(SkFontStyle::kBlack_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kOblique_Slant); SkFontStyle expanded_normal_100(SkFontStyle::kThin_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kUpright_Slant); SkFontStyle expanded_normal_900(SkFontStyle::kBlack_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kUpright_Slant); SkFontStyle expanded_italic_100(SkFontStyle::kThin_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kItalic_Slant); SkFontStyle expanded_italic_900(SkFontStyle::kBlack_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kItalic_Slant); + SkFontStyle expanded_obliqu_100(SkFontStyle::kThin_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kOblique_Slant); + SkFontStyle expanded_obliqu_900(SkFontStyle::kBlack_Weight, SkFontStyle::kExpanded_Width, SkFontStyle::kOblique_Slant); SkFontStyle normal_normal_100(SkFontStyle::kThin_Weight, SkFontStyle::kNormal_Width, SkFontStyle::kUpright_Slant); SkFontStyle normal_normal_200(SkFontStyle::kExtraLight_Weight, SkFontStyle::kNormal_Width, SkFontStyle::kUpright_Slant); @@ -462,16 +466,21 @@ static void test_matchStyleCSS3(skiatest::Reporter* reporter) { }, { - { expanded_normal_100,expanded_normal_900,expanded_italic_100,expanded_italic_900 }, + { expanded_normal_100,expanded_normal_900, + expanded_italic_100,expanded_italic_900 }, { { condensed_normal_100, expanded_normal_100 }, { condensed_normal_900, expanded_normal_900 }, { condensed_italic_100, expanded_italic_100 }, { condensed_italic_900, expanded_italic_900 }, + { condensed_obliqu_100, expanded_italic_100 }, + { condensed_obliqu_900, expanded_italic_900 }, { expanded_normal_100, expanded_normal_100 }, { expanded_normal_900, expanded_normal_900 }, { expanded_italic_100, expanded_italic_100 }, { expanded_italic_900, expanded_italic_900 }, + { expanded_obliqu_100, expanded_italic_100 }, + { expanded_obliqu_900, expanded_italic_900 }, }, }, @@ -626,6 +635,61 @@ static void test_matchStyleCSS3(skiatest::Reporter* reporter) { { normal_normal_600, invalidFontStyle }, }, }, + { + { expanded_normal_100,expanded_normal_900, + expanded_italic_100,expanded_italic_900, + expanded_obliqu_100,expanded_obliqu_900, }, + { + { condensed_normal_100, expanded_normal_100 }, + { condensed_normal_900, expanded_normal_900 }, + { condensed_italic_100, expanded_italic_100 }, + { condensed_italic_900, expanded_italic_900 }, + { condensed_obliqu_100, expanded_obliqu_100 }, + { condensed_obliqu_900, expanded_obliqu_900 }, + { expanded_normal_100, expanded_normal_100 }, + { expanded_normal_900, expanded_normal_900 }, + { expanded_italic_100, expanded_italic_100 }, + { expanded_italic_900, expanded_italic_900 }, + { expanded_obliqu_100, expanded_obliqu_100 }, + { expanded_obliqu_900, expanded_obliqu_900 }, + }, + }, + { + { expanded_normal_100,expanded_normal_900, + expanded_obliqu_100,expanded_obliqu_900, }, + { + { condensed_normal_100, expanded_normal_100 }, + { condensed_normal_900, expanded_normal_900 }, + { condensed_italic_100, expanded_obliqu_100 }, + { condensed_italic_900, expanded_obliqu_900 }, + { condensed_obliqu_100, expanded_obliqu_100 }, + { condensed_obliqu_900, expanded_obliqu_900 }, + { expanded_normal_100, expanded_normal_100 }, + { expanded_normal_900, expanded_normal_900 }, + { expanded_italic_100, expanded_obliqu_100 }, + { expanded_italic_900, expanded_obliqu_900 }, + { expanded_obliqu_100, expanded_obliqu_100 }, + { expanded_obliqu_900, expanded_obliqu_900 }, + }, + }, + { + { expanded_italic_100,expanded_italic_900, + expanded_obliqu_100,expanded_obliqu_900, }, + { + { condensed_normal_100, expanded_obliqu_100 }, + { condensed_normal_900, expanded_obliqu_900 }, + { condensed_italic_100, expanded_italic_100 }, + { condensed_italic_900, expanded_italic_900 }, + { condensed_obliqu_100, expanded_obliqu_100 }, + { condensed_obliqu_900, expanded_obliqu_900 }, + { expanded_normal_100, expanded_obliqu_100 }, + { expanded_normal_900, expanded_obliqu_900 }, + { expanded_italic_100, expanded_italic_100 }, + { expanded_italic_900, expanded_italic_900 }, + { expanded_obliqu_100, expanded_obliqu_100 }, + { expanded_obliqu_900, expanded_obliqu_900 }, + }, + }, }; for (StyleSetTest& test : tests) { |