Begin switch to SkFontStyle for legacy calls.

include/ports/SkFontConfigInterface.h

Index: include/ports/SkFontConfigInterface.h
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index 063cb9d553ba9552e6798c6c9f224f6d67e7ba5f..464251bc2dce5a7b2eae353f2898faa6db310853 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -80,11 +80,19 @@ public:
      *
      *  If a match is not found, return false, and ignore all out parameters.
      */
+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
     virtual bool matchFamilyName(const char familyName[],
                                  SkTypeface::Style requested,
                                  FontIdentity* outFontIdentifier,
                                  SkString* outFamilyName,
                                  SkTypeface::Style* outStyle) = 0;
+#else
+    virtual bool matchFamilyName(const char familyName[],
+                                 SkFontStyle requested,
+                                 FontIdentity* outFontIdentifier,
+                                 SkString* outFamilyName,
+                                 SkFontStyle* outStyle) = 0;
+#endif
 
     /**
      *  Given a FontRef, open a stream to access its data, or return null