aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
diff options
context:
space:
mode:
authorGravatar drott <drott@chromium.org>2016-10-11 09:03:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-10-11 09:03:46 -0700
commit1c7805bb1c3030efd7a4c848133b4f19285a9df1 (patch)
treeaa654dba4c9a471f31f191368df75b30d2965feb /src/ports
parentccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3 (diff)
Remove restrictive format pattern for Fontconfig matching
This pattern pushes CFF fonts too far low in the list. Instead it is enough to rely on the isValidPattern function to skip Type 1 fonts. BUG=skia:5846 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2410063002 Review-Url: https://codereview.chromium.org/2410063002
Diffstat (limited to 'src/ports')
-rw-r--r--src/ports/SkFontConfigInterface_direct.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index c8bafc712a..df68fae0a8 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -597,11 +597,6 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
-#ifdef SK_FONT_CONFIG_INTERFACE_ONLY_ALLOW_SFNT_FONTS
- FcPatternAddString(pattern, FC_FONTFORMAT, reinterpret_cast<const FcChar8*>(kFontFormatTrueType));
- FcPatternAddString(pattern, FC_FONTFORMAT, reinterpret_cast<const FcChar8*>(kFontFormatCFF));
-#endif
-
FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
FcDefaultSubstitute(pattern);