Linux: don't crash when performing font fallback to a non-scalable font.

skia/ext/SkFontHost_fontconfig_direct.cpp

 /* libs/graphics/ports/SkFontHost_fontconfig_direct.cpp
 **
 ** Copyright 2009, Google Inc.
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
 ** You may obtain a copy of the License at
 **
 **     http://www.apache.org/licenses/LICENSE-2.0
 **
@@ skipping 58 matching lines @@
     }
 
     fcvalue.type = FcTypeInteger;
     fcvalue.u.i = is_bold && *is_bold ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL;
     FcPatternAdd(pattern, FC_WEIGHT, fcvalue, 0);
 
     fcvalue.type = FcTypeInteger;
     fcvalue.u.i = is_italic && *is_italic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN;
     FcPatternAdd(pattern, FC_SLANT, fcvalue, 0);
 
+    fcvalue.type = FcTypeBool;
+    fcvalue.u.b = FcTrue;
+    FcPatternAdd(pattern, FC_SCALABLE, fcvalue, 0);
+
     FcConfigSubstitute(0, pattern, FcMatchPattern);
     FcDefaultSubstitute(pattern);
 
     // Font matching:
     // CSS often specifies a fallback list of families:
     //    font-family: a, b, c, serif;
     // However, fontconfig will always do its best to find *a* font when asked
     // for something so we need a way to tell if the match which it has found is
     // "good enough" for us. Otherwise, we can return NULL which gets piped up
     // and lets WebKit know to try the next CSS family name. However, fontconfig
@@ skipping 21 matching lines @@
     FcChar8* post_config_family;
     FcPatternGetString(pattern, FC_FAMILY, 0, &post_config_family);
 
     FcResult result;
     FcPattern* match = FcFontMatch(0, pattern, &result);
     if (!match) {
         FcPatternDestroy(pattern);
         return false;
     }
 
-    // Skip non-scalable fonts. They don't work with FT_Set_Char_Size()
-    // in SkFontHost_FreeType.cpp.
-    FcBool scalable = FcFalse;
-    FcPatternGetBool(match, FC_SCALABLE, 0, &scalable);
-    if (scalable != FcTrue) {
-        FcPatternDestroy(match);
-        FcPatternDestroy(pattern);
-        return false;
-    }
-
     FcChar8* post_match_family;
     FcPatternGetString(match, FC_FAMILY, 0, &post_match_family);
     const bool family_names_match =
         family.empty() ?
         true :
         strcasecmp((char *)post_config_family, (char *)post_match_family) == 0;
 
     FcPatternDestroy(pattern);
 
     if (!family_names_match && !IsFallbackFontAllowed(family)) {
@@ skipping 68 matching lines @@
 
 int FontConfigDirect::Open(unsigned fileid) {
     SkAutoMutexAcquire ac(mutex_);
     const std::map<unsigned, std::string>::const_iterator
         i = fileid_to_filename_.find(fileid);
     if (i == fileid_to_filename_.end())
         return -1;
 
     return open(i->second.c_str(), O_RDONLY);
 }