SkTypeface::MakeFromName to take SkFontStyle.

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"
 #include "SkFontMgr.h"
 #include "SkMutex.h"
 #include "SkOTTable_OS_2.h"
 #include "SkOncePtr.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 SkTypeface::SkTypeface(const SkFontStyle& style, SkFontID fontID, bool isFixedPitch)
     : fUniqueID(fontID), fStyle(style), fIsFixedPitch(isFixedPitch) { }
 
 SkTypeface::~SkTypeface() { }
 
 #ifdef SK_WHITELIST_SERIALIZED_TYPEFACES
 extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
 #define SK_TYPEFACE_DELEGATE WhitelistSerializeTypeface
 #else
 #define SK_TYPEFACE_DELEGATE nullptr
 #endif
 
-SkTypeface* (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style ) = nullptr;
+#ifndef SK_DONT_USE_LEGACY_TYPEFACE_CREATE_FROM_NAME
+SkTypeface* (*gCreateTypefaceDelegate)(const char[], SkTypeface::Style style) = nullptr;
+#endif
+SkTypeface* (*gNewCreateTypefaceDelegate)(const char[], SkFontStyle) = nullptr;
 void (*gSerializeTypefaceDelegate)(const SkTypeface*, SkWStream* ) = SK_TYPEFACE_DELEGATE;
 SkTypeface* (*gDeserializeTypefaceDelegate)(SkStream* ) = nullptr;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkEmptyTypeface : public SkTypeface {
 public:
     static SkEmptyTypeface* Create() { return new SkEmptyTypeface; }
 protected:
     SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { }
@@ skipping 60 matching lines @@
     }
     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) {
+#ifndef SK_DONT_USE_LEGACY_TYPEFACE_CREATE_FROM_NAME
+SkTypeface* SkTypeface::CreateFromName(const char name[], SkTypeface::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, style);
 }
+#endif
+
+SkTypeface* SkTypeface::CreateFromName(const char name[],
+                                       SkFontStyle fontStyle) {
+  if (gNewCreateTypefaceDelegate) {
+      SkTypeface* result = (*gNewCreateTypefaceDelegate)(name, fontStyle);
+      if (result) {
+          return result;
+      }
+  }
+  if (nullptr == name) {
+    return RefDefault();
+  }
+  SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+  return fm->matchFamilyStyle(name, fontStyle);

[bungeman-skia, 2016/04/08 18:59:21]

I believe Chromium on Linux is currently using an default SkFontMgr for which
this will not work. They should be using src/ports/SkFontMgr_fontconfig but are
instead using src/fonts/SkFontMgr_fontconfig.cpp because that's set as the
hobbled default for Blink for IPC.

[Mikus, 2016/05/19 09:34:02]

Maybe I'll disable this for Linux and let the Linux people fix this later?

BTW sorry for the month-long delay, I was on a vacation.

+}
+
 
 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 52 matching lines @@
         return nullptr;
     }
 
     SkFontData* data = desc.detachFontData();
     if (data) {
         SkTypeface* typeface = SkTypeface::CreateFromFontData(data);
         if (typeface) {
             return typeface;
         }
     }
-    return SkTypeface::CreateFromName(desc.getFamilyName(), desc.getStyle());
+    return SkTypeface::CreateFromName(desc.getFamilyName(),
+                                      SkFontStyle(desc.getStyle()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkTypeface::countTables() const {
     return this->onGetTableTags(nullptr);
 }
 
 int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
     return this->onGetTableTags(tags);
@@ skipping 145 matching lines @@
     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;
 }