Linux: fix fake italics for font's without italic variants.

skia/ext/SkFontHost_fontconfig.cpp

 /* libs/graphics/ports/SkFontHost_fontconfig.cpp
 **
 ** Copyright 2008, 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 83 matching lines @@
                                        SkTypeface::Style style)
 {
     std::string resolved_family_name;
 
     if (familyFace) {
         // Given the fileid we can ask fontconfig for the familyname of the
         // font.
         const unsigned fileid = UniqueIdToFileId(familyFace->uniqueID());
         if (!GetFcImpl()->Match(
           &resolved_family_name, NULL, true /* fileid valid */, fileid, "",
-          -1, -1)) {
+          NULL, NULL)) {
             return NULL;
         }
     } else if (familyName) {
         resolved_family_name = familyName;
     } else {
         return NULL;
     }
 
-    const bool bold = style & SkTypeface::kBold;
-    const bool italic = style & SkTypeface::kItalic;
+    bool bold = style & SkTypeface::kBold;
+    bool italic = style & SkTypeface::kItalic;
     unsigned fileid;
     if (!GetFcImpl()->Match(NULL, &fileid, false, -1, /* no fileid */
-                               resolved_family_name, bold, italic)) {
+                               resolved_family_name, &bold, &italic)) {
         return NULL;
     }
+    const SkTypeface::Style resulting_style = static_cast<SkTypeface::Style>(
+        (bold ? SkTypeface::kBold : 0) |
+        (italic ? SkTypeface::kItalic : 0));
 
-    const unsigned id = FileIdAndStyleToUniqueId(fileid, style);
-    SkTypeface* typeface = SkNEW_ARGS(FontConfigTypeface, (style, id));
+    const unsigned id = FileIdAndStyleToUniqueId(fileid, resulting_style);
+    SkTypeface* typeface = SkNEW_ARGS(FontConfigTypeface, (resulting_style, id));
 
     {
         SkAutoMutexAcquire ac(global_fc_map_lock);
         global_fc_typefaces[id] = typeface;
     }
 
     return typeface;
 }
 
 // static
@@ skipping 95 matching lines @@
     return SkNEW_ARGS(SkFileDescriptorStream, (fd));
 }
 
 size_t SkFontHost::ShouldPurgeFontCache(size_t sizeAllocatedSoFar)
 {
     if (sizeAllocatedSoFar > kFontCacheMemoryBudget)
         return sizeAllocatedSoFar - kFontCacheMemoryBudget;
     else
         return 0;   // nothing to do
 }