Clean up SkFontConfigInterface implementation.

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"
 
 struct SkBaseMutex;
+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().
      */
     static SkFontConfigInterface* RefGlobal();
 
     /**
      *  Replace the current global instance with the specified one, safely
@@ skipping 66 matching lines @@
      */
     virtual SkTypeface* createTypeface(const FontIdentity& identity) {
         return SkTypeface::CreateFromStream(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(SkBaseMutex* mutex = NULL);
+    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