improve bitmap font support (FreeType only)

src/ports/SkFontConfigInterface_direct.cpp

 /*
  * Copyright 2009 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
 
 #include <string>
@@ skipping 312 matching lines @@
 // tells you whether a given request is for such a fallback.
 bool IsFallbackFontAllowed(const std::string& family) {
   const char* family_cstr = family.c_str();
   return family.empty() ||
          strcasecmp(family_cstr, "sans") == 0 ||
          strcasecmp(family_cstr, "serif") == 0 ||
          strcasecmp(family_cstr, "monospace") == 0;
 }
 
 static bool valid_pattern(FcPattern* pattern) {
+#ifdef SK_FONT_CONFIG_ONLY_ALLOW_SCALABLE_FONTS
     FcBool is_scalable;
     if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &is_scalable) != FcResultMatch
         || !is_scalable) {
         return false;
     }
+#endif
 
     // fontconfig can also return fonts which are unreadable
     const char* c_filename = get_name(pattern, FC_FILE);
     if (!c_filename) {
         return false;
     }
     if (access(c_filename, R_OK) != 0) {
         return false;
     }
     return true;
@@ skipping 377 matching lines @@
                 *trimmedMatches.append() = match[i];
             }
         }
 
         SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
                                              (trimmedMatches.begin(),
                                               trimmedMatches.count()));
 #endif
     return false;
 }