Split SkFontConfigInterface globals and factory.

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
 
 #include "SkDataTable.h"
 #include "SkFontStyle.h"
 #include "SkRefCnt.h"
 #include "SkTypeface.h"
 
 class SkFontMgr;
 
 /**
  *  \class SkFontConfigInterface
  *
  *  A simple interface for remotable font management.
  *  The global instance can be found with RefGlobal().
  */
 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.

 
     /**
      *  Replace the current global instance with the specified one, safely
      *  ref'ing the new instance, and unref'ing the previous. Returns its
      *  parameter (the new global instance).
      */
     static SkFontConfigInterface* SetGlobal(SkFontConfigInterface*);
 
     /**
      *  This should be treated as private to the impl of SkFontConfigInterface.
@@ skipping 55 matching lines @@
      *  The default implementation simply returns a new typeface built using data obtained from
      *  openStream(), but derived classes may implement more complex caching schemes.
      */
     virtual sk_sp<SkTypeface> makeTypeface(const FontIdentity& identity) {
         return SkTypeface::MakeFromStream(this->openStream(identity), identity.fTTCIndex);
     }
 
     /**
      *  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 sk_sp<SkDataTable> getFamilyNames() { return SkDataTable::MakeEmpty(); }
     typedef SkRefCnt INHERITED;
 };
 
-/** Creates a SkFontMgr which wraps a SkFontConfigInterface. */
-SK_API SkFontMgr* SkFontMgr_New_FCI(SkFontConfigInterface* fci);
-
 #endif