Begin switch to SkFontStyle for legacy calls.

src/core/SkFontMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
 #include "SkOncePtr.h"
@@ skipping 56 matching lines @@
     SkTypeface* onCreateFromData(SkData*, int) const override {
         return nullptr;
     }
     SkTypeface* onCreateFromStream(SkStreamAsset* stream, int) const override {
         delete stream;
         return nullptr;
     }
     SkTypeface* onCreateFromFile(const char[], int) const override {
         return nullptr;
     }
+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
     SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const override {
+#else
+    SkTypeface* onLegacyCreateTypeface(const char [], SkFontStyle) const override {
+#endif
         return nullptr;
     }
 };
 
 static SkFontStyleSet* emptyOnNull(SkFontStyleSet* fsset) {
     if (nullptr == fsset) {
         fsset = SkFontStyleSet::CreateEmpty();
     }
     return fsset;
 }
@@ skipping 70 matching lines @@
     return ret;
 }
 
 SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
     if (nullptr == path) {
         return nullptr;
     }
     return this->onCreateFromFile(path, ttcIndex);
 }
 
-SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[],
-                                            unsigned styleBits) const {
-    return this->onLegacyCreateTypeface(familyName, styleBits);
+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
+SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[], unsigned style) const {
+#else
+SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[], SkFontStyle style) const {
+#endif
+    return this->onLegacyCreateTypeface(familyName, style);
 }
 
 SK_DECLARE_STATIC_ONCE_PTR(SkFontMgr, singleton);
 SkFontMgr* SkFontMgr::RefDefault() {
     return SkRef(singleton.get([]{
         SkFontMgr* fm = SkFontMgr::Factory();
         return fm ? fm : new SkEmptyFontMgr;
     }));
 }
 
@@ skipping 90 matching lines @@
             }
         }
 
         if (currentScore.score > maxScore.score) {
             maxScore = currentScore;
         }
     }
 
     return this->createTypeface(maxScore.index);
 }