Add oblique as a slant.

src/fonts/SkFontMgr_fontconfig.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkFontConfigTypeface.h"
 #include "SkFontMgr.h"
@@ skipping 150 matching lines @@
                      int old_min, int old_max, int new_min, int new_max) {
     SkASSERT(old_min < old_max);
     SkASSERT(new_min < new_max);
     return new_min + SkMulDiv(value - old_min,
                               new_max - new_min, old_max - old_min);
 }
 
 static SkFontStyle make_fontconfig_style(FcPattern* match) {
     int weight = get_int(match, FC_WEIGHT);
     int width = get_int(match, FC_WIDTH);
-    int slant = get_int(match, FC_SLANT);
-//    SkDebugf("old weight %d new weight %d\n", weight, map_range(weight, 0, 80, 0, 400));
+    int fcSlant = get_int(match, FC_SLANT);
 
     // fontconfig weight seems to be 0..200 or so, so we remap it here
     weight = map_range(weight, 0, 80, 0, 400);
     width = map_range(width, 0, 200, 0, 9);
-    return SkFontStyle(weight, width, slant > 0 ? SkFontStyle::kItalic_Slant
-                                                : SkFontStyle::kUpright_Slant);
+    SkFontStyle::Slant skSlant = SkFontStyle::kUpright_Slant;
+    switch (fcSlant) {
+        case FC_SLANT_ROMAN:   skSlant = SkFontStyle::kUpright_Slant; break;
+        case FC_SLANT_ITALIC : skSlant = SkFontStyle::kItalic_Slant ; break;
+        case FC_SLANT_OBLIQUE: skSlant = SkFontStyle::kOblique_Slant; break;
+        default: SkASSERT(false); break;
+    }
+    return SkFontStyle(weight, width, skSlant);
 }
 
 SkFontStyleSet_FC::SkFontStyleSet_FC(FcPattern** matches, int count) {
     fRecCount = count;
     fRecs = new Rec[count];
     for (int i = 0; i < count; ++i) {
         fRecs[i].fStyleName.set(get_name(matches[i], FC_STYLE));
         fRecs[i].fFileName.set(get_name(matches[i], FC_FILE));
         fRecs[i].fStyle = make_fontconfig_style(matches[i]);
     }
@@ skipping 132 matching lines @@
     SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override {
         FCLocker lock;
         return FontConfigTypeface::LegacyCreateTypeface(familyName, style);
     }
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     SkFontConfigInterface* fci = RefFCI();
     return fci ? new SkFontMgr_fontconfig(fci) : nullptr;
 }