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;
+SkTypeface* (*gCreateTypefaceDelegate)(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) {
-    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);
+SkTypeface* SkTypeface::CreateFromName(const char name[],
+                                       SkFontStyle fontStyle) {
+  if (gCreateTypefaceDelegate) {
+      SkTypeface* result = (*gCreateTypefaceDelegate)(name, fontStyle);
+      if (result) {
+          return result;
+      }
+  }
+  if (nullptr == name) {
+    return RefDefault();
+  }
+  SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+  return fm->matchFamilyStyle(name, fontStyle);

[bungeman-skia, 2016/03/22 20:16:43]

I'm not sure we can make this change directly either without some extra thought.
'legacyCreateTypeface' never fails unless something really bad happens, it does
all sorts of generally unwanted fallback automatically to make sure it doesn't
return nullptr. 'matchFamilyStyle' however, is much more conservative, and will
only return 'good' matches. If the caller isn't used to handling fallback
itself, making this change might be surprising.

[Mikus, 2016/03/23 10:47:17]

What do you suggest, then? Should I restore the CreateFromNameAndStyle or
overload CreateFromName?

[Mikus, 2016/03/24 12:08:26]

I suggest that we roll this and check the test results.

 }
 
+
 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 51 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;
 }