Begin switch to SkFontStyle for legacy calls.

src/fonts/SkFontMgr_indirect.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDataTable.h"
 #include "SkFontMgr.h"
 #include "SkFontMgr_indirect.h"
@@ skipping 166 matching lines @@
 }
 
 SkTypeface* SkFontMgr_Indirect::onCreateFromFile(const char path[], int ttcIndex) const {
     return fImpl->createFromFile(path, ttcIndex);
 }
 
 SkTypeface* SkFontMgr_Indirect::onCreateFromData(SkData* data, int ttcIndex) const {
     return fImpl->createFromData(data, ttcIndex);
 }
 
+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
 SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[],
                                                        unsigned styleBits) const {
-    bool bold = SkToBool(styleBits & SkTypeface::kBold);
-    bool italic = SkToBool(styleBits & SkTypeface::kItalic);
-    SkFontStyle style = SkFontStyle(bold ? SkFontStyle::kBold_Weight
-                                         : SkFontStyle::kNormal_Weight,
-                                    SkFontStyle::kNormal_Width,
-                                    italic ? SkFontStyle::kItalic_Slant
-                                           : SkFontStyle::kUpright_Slant);
-
+    SkFontStyle style = SkFontStyle::FromOldStyle(styleBits);
+#else
+SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[],
+                                                       SkFontStyle style) const {
+#endif
     SkAutoTUnref<SkTypeface> face(this->matchFamilyStyle(familyName, style));
 
     if (nullptr == face.get()) {
         face.reset(this->matchFamilyStyle(nullptr, style));
     }
 
     if (nullptr == face.get()) {
         SkFontIdentity fontId = this->fProxy->matchIndexStyle(0, style);
         face.reset(this->createTypefaceFromFontId(fontId));
     }
 
     return face.release();
 }