Begin switch to SkFontStyle for legacy calls.

tools/sk_tool_utils_font.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 "Resources.h"
 #include "SkFontMgr.h"
 #include "SkMutex.h"
@@ skipping 29 matching lines @@
                 break;
             }
         }
         if (!fontData) {
             // Once all legacy callers to portable fonts are converted, replace this with
             // SK_ABORT();
             SkDebugf("missing %s %d\n", name, style);
             // If we called SkTypeface::CreateFromName() here we'd recurse infinitely,
             // so we reimplement its core logic here inline without the recursive aspect.
             SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
             return fm->legacyCreateTypeface(name, style);
+#else
+            return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(style));
+#endif
         }
     } else {
         sub = &gSubFonts[gDefaultFontIndex];
         fontData = &sub->fFont;
     }
     SkTestFont* font;
     {
         SkAutoMutexAcquire ac(gTestFontMutex);
         if (fontData->fFontCache) {
             font = SkSafeRef(fontData->fFontCache);
         } else {
             font = new SkTestFont(*fontData);
             SkDEBUGCODE(font->fDebugName = sub->fName);
             SkDEBUGCODE(font->fDebugStyle = sub->fStyle);
             fontData->fFontCache = SkSafeRef(font);
         }
     }
-    return new SkTestTypeface(font, SkFontStyle(style));
+    return new SkTestTypeface(font, SkFontStyle::FromOldStyle(style));
 }
 
 }