Revert of Move SkTypeface to sk_sp.

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 79 matching lines @@
      *  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.
      *
      *  The default implementation simply returns a new typeface built using data obtained from
      *  openStream(), but derived classes may implement more complex caching schemes.
+     *
+     *  Callers are responsible for unref-ing the result.
      */
-    virtual sk_sp<SkTypeface> makeTypeface(const FontIdentity& identity) {
-        return SkTypeface::MakeFromStream(this->openStream(identity), identity.fTTCIndex);
+    virtual SkTypeface* createTypeface(const FontIdentity& identity) {
+        return SkTypeface::CreateFromStream(this->openStream(identity), identity.fTTCIndex);
     }
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
-    virtual SkTypeface* createTypeface(const FontIdentity& identity) {
-        return this->makeTypeface(identity).release();
-    }
-#endif
 
     /**
      *  Return a singleton instance of a direct subclass that calls into
      *  libfontconfig. This does not affect the refcnt of the returned instance.
      *  The mutex may be used to guarantee the singleton is only constructed once.
      */
     static SkFontConfigInterface* GetSingletonDirectInterface();
 
     // New APIS, which have default impls for now (which do nothing)
 
     virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
     typedef SkRefCnt INHERITED;
 };
 
 /** Creates a SkFontMgr which wraps a SkFontConfigInterface. */
 SK_API SkFontMgr* SkFontMgr_New_FCI(SkFontConfigInterface* fci);
 
 #endif