Split SkFontConfigInterface globals and factory.

include/ports/SkFontConfigInterface.h

Index: include/ports/SkFontConfigInterface.h
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index 30fc8a35fb2315982d6826ccbfe6a138c5482f9c..74f766f52e8acf31f6cde398acf89cf9b4b85f31 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -25,9 +25,10 @@ class SK_API SkFontConfigInterface : public SkRefCnt {
 public:
 
     /**
-     *  Returns the global SkFontConfigInterface instance, and if it is not
-     *  NULL, calls ref() on it. The caller must balance this with a call to
-     *  unref().
+     *  Returns the global SkFontConfigInterface instance. If it is not
+     *  nullptr, calls ref() on it. The caller must balance this with a call to
+     *  unref(). The default SkFontConfigInterface is the result of calling
+     *  GetSingletonDirectInterface.
      */
     static SkFontConfigInterface* RefGlobal();

[reed1, 2016/09/19 19:10:08]

sk_sp<...> ?

[bungeman-skia, 2016/09/19 19:11:27]

Yeah, that needs to be done too.

 
@@ -105,7 +106,6 @@ public:
     /**
      *  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();
 
@@ -115,7 +115,4 @@ public:
     typedef SkRefCnt INHERITED;
 };
 
-/** Creates a SkFontMgr which wraps a SkFontConfigInterface. */
-SK_API SkFontMgr* SkFontMgr_New_FCI(SkFontConfigInterface* fci);
-
 #endif