refactoring for SK_FONTHOST_USES_FONTMGR option

include/ports/SkFontMgr.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 SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
@@ skipping 13 matching lines @@
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
     virtual SkTypeface* createTypeface(int index) = 0;
     virtual SkTypeface* matchStyle(const SkFontStyle& pattern) = 0;
 
     static SkFontStyleSet* CreateEmpty();
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
+class SkTypeface;
+
 class SK_API SkFontMgr : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkFontMgr)
 
     int countFamilies();
     void getFamilyName(int index, SkString* familyName);
     SkFontStyleSet* createStyleSet(int index);
 
     SkFontStyleSet* matchFamily(const char familyName[]);
 
@@ skipping 22 matching lines @@
     SkTypeface* createFromStream(SkStream*, int ttcIndex = 0);
 
     /**
      *  Create a typeface for the specified fileName and TTC index
      *  (pass 0 for none) or NULL if the file is not found, or its contents are
      *  not recognized. The caller must call unref() on the returned object
      *  if it is not null.
      */
     SkTypeface* createFromFile(const char path[], int ttcIndex = 0);
 
+    SkTypeface* legacyCreateTypeface(const char familyName[],
+                                     unsigned typefaceStyleBits);
+
     /**
      *  Return a ref to the default fontmgr. The caller must call unref() on
      *  the returned object.
      */
     static SkFontMgr* RefDefault();
 
 protected:
     virtual int onCountFamilies() = 0;
     virtual void onGetFamilyName(int index, SkString* familyName) = 0;
     virtual SkFontStyleSet* onCreateStyleSet(int index) = 0;
 
     virtual SkFontStyleSet* onMatchFamily(const char familyName[]) = 0;
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle&) = 0;
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
                                          const SkFontStyle&) = 0;
 
     virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) = 0;
     virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) = 0;
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0;
 
+    // TODO: make this pure-virtual once all ports know about it
+    virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
+                                               unsigned styleBits);
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif