Implement matchFamilyStyle for SkFontMgr_fontconfig

src/core/SkTypeface.cpp

 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkEndian.h"
 #include "SkFontDescriptor.h"
@@ skipping 78 matching lines @@
         // CreateTypeface is happening at any given time.
         // TODO(bungeman, mtklein): This is sad.  Make our fontconfig code safe?
         SkAutoMutexAcquire lock(&gCreateDefaultMutex);
 
         SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
         SkTypeface* t = fm->legacyCreateTypeface(nullptr, SkFontStyle::FromOldStyle(style));
         return t ? t : SkEmptyTypeface::Create();
     });
 }
 
+SkTypeface* SkTypeface::GetDefaultTypeface(SkFontStyle style) {
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    SkTypeface* t = fm->matchFamilyStyle(nullptr, style);
+    return t ? t : SkEmptyTypeface::Create();
+}
+
 SkTypeface* SkTypeface::RefDefault(Style style) {
     return SkRef(GetDefaultTypeface(style));
 }
 
+SkTypeface* SkTypeface::RefDefault(SkFontStyle style) {
+    return SkRef(GetDefaultTypeface(style));
+}
+
 uint32_t SkTypeface::UniqueID(const SkTypeface* face) {
     if (nullptr == face) {
         face = GetDefaultTypeface();
     }
     return face->uniqueID();
 }
 
 bool SkTypeface::Equal(const SkTypeface* facea, const SkTypeface* faceb) {
     return facea == faceb || SkTypeface::UniqueID(facea) == SkTypeface::UniqueID(faceb);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkTypeface::CreateFromName(const char name[], Style style) {
     if (gCreateTypefaceDelegate) {
         SkTypeface* result = (*gCreateTypefaceDelegate)(name, style);
         if (result) {
             return result;
         }
     }
     if (nullptr == name) {
         return RefDefault(style);
     }
     SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
     return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(style));
 }
 
+SkTypeface* SkTypeface::CreateFromName(const char name[], SkFontStyle style) {
+    if (nullptr == name) {
+        return RefDefault(style);
+    }
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->matchFamilyStyle(name, style);
+}
+
 SkTypeface* SkTypeface::CreateFromTypeface(const SkTypeface* family, Style s) {
     if (!family) {
         return SkTypeface::RefDefault(s);
     }
 
     if (family->style() == s) {
         family->ref();
         return const_cast<SkTypeface*>(family);
     }
 
@@ skipping 217 matching lines @@
     SkAutoTDelete<SkScalerContext> ctx(this->createScalerContext(noeffects, desc, true));
     if (ctx.get()) {
         SkPaint::FontMetrics fm;
         ctx->getFontMetrics(&fm);
         bounds->set(fm.fXMin * invTextSize, fm.fTop * invTextSize,
                     fm.fXMax * invTextSize, fm.fBottom * invTextSize);
         return true;
     }
     return false;
 }