From d803cdad725b6db07b6df0ae7f390f5dbef46475 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 16 Apr 2015 14:22:46 -0700 Subject: Add PS 'all' weight name to scanFont. Multiple Master fonts often list their weight as 'all'. However, they usually default to normal weight. State explicitly that we know about this weight string. Review URL: https://codereview.chromium.org/1092793002 --- src/ports/SkFontHost_FreeType.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 5a4b75579b..4b8345a94c 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1681,6 +1681,7 @@ bool SkTypeface_FreeType::Scanner::scanFont( int const weight; } commonWeights [] = { // There are probably more common names, but these are known to exist. + { "all", SkFontStyle::kNormal_Weight }, // Multiple Masters usually default to normal. { "black", SkFontStyle::kBlack_Weight }, { "bold", SkFontStyle::kBold_Weight }, { "book", (SkFontStyle::kNormal_Weight + SkFontStyle::kLight_Weight)/2 }, -- cgit v1.2.3