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) {
-    FcBool is_scalable;
-    if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &is_scalable) != FcResultMatch
-        || !is_scalable) {
-        return false;
-    }
+//    FcBool is_scalable;

[reed1, 2013/12/09 16:58:42]

Why is this section commented out? Can we delete it?

[bungeman-skia, 2013/12/09 19:42:44]

This change is required so that bitmap fonts are not rejected outright on Linux.
With this code still in place, users of this path (which is currently Skia tools
and Chromium) will never see a bitmap font. This is currently like this due to
the uncertainty of simply enabling these in Chrome. Seeing that the layout tests
pass with this change, it seems like we might be ok to remove this.

+//    if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &is_scalable) != FcResultMatch
+//        || !is_scalable) {
+//        return false;
+//    }
 
     // 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;
 }