Replace SkTypeface::Style with SkFontStyle.

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 "SkOSFile.h"
 #include "SkTestScalerContext.h"
@@ skipping 45 matching lines @@
         if (fontData->fFontCache) {
             font = SkSafeRef(fontData->fFontCache);
         } else {
             font = SkNEW_ARGS(SkTestFont, (*fontData));
             SkDEBUGCODE(font->fDebugName = sub->fName);
             SkDEBUGCODE(font->fDebugStyle = sub->fStyle);
             fontData->fFontCache = SkSafeRef(font);
             atexit(release_portable_typefaces);
         }
     }
-    return SkNEW_ARGS(SkTestTypeface, (font, style));
+    return SkNEW_ARGS(SkTestTypeface, (font, SkFontStyle(style)));
 }
 
 
 SkTypeface* resource_font(const char* name, SkTypeface::Style style) {
     const char* file = NULL;
     if (name) {
         for (int index = 0; index < gSubFontsCount; ++index) {
             const SubFont& sub = gSubFonts[index];
             if (!strcmp(name, sub.fName) && sub.fStyle == style) {
                 file = sub.fFile;
@@ skipping 92 matching lines @@
                 break;
             }
         }
        fprintf(out, ";\n");
     }
     fclose(out);
 }
 #endif
 
 }