Begin switch to SkFontStyle for legacy calls.

include/ports/SkFontConfigInterface.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontConfigInterface_DEFINED
 #define SkFontConfigInterface_DEFINED
 
@@ skipping 62 matching lines @@
      *  Given a familyName and style, find the best match.
      *
      *  If a match is found, return true and set its outFontIdentifier.
      *      If outFamilyName is not null, assign the found familyName to it
      *          (which may differ from the requested familyName).
      *      If outStyle is not null, assign the found style to it
      *          (which may differ from the requested style).
      *
      *  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
      *  if the FontRef's data is not available. The caller is responsible for
      *  deleting the stream when it is done accessing the data.
      */
     virtual SkStreamAsset* openStream(const FontIdentity&) = 0;
 
     /**
      *  Return an SkTypeface for the given FontIdentity.
@@ skipping 14 matching lines @@
      */
     static SkFontConfigInterface* GetSingletonDirectInterface(SkBaseMutex* mutex = NULL);
 
     // New APIS, which have default impls for now (which do nothing)
 
     virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
     typedef SkRefCnt INHERITED;
 };
 
 #endif