Split SkFontConfigInterface globals and factory.

src/ports/SkFontMgr_FontConfigInterface_factory.cpp

 /*
  * Copyright 2008 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkFontMgr.h"
-#include "SkMutex.h"
-#include "SkRefCnt.h"
+#include "SkFontMgr_FontConfigInterface.h"
 
-SK_DECLARE_STATIC_MUTEX(gFontConfigInterfaceMutex);
-static SkFontConfigInterface* gFontConfigInterface;
-
-SkFontConfigInterface* SkFontConfigInterface::RefGlobal() {
-    SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
-
-    return SkSafeRef(gFontConfigInterface);
-}
-
-SkFontConfigInterface* SkFontConfigInterface::SetGlobal(SkFontConfigInterface* fc) {
-    SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
-
-    SkRefCnt_SafeAssign(gFontConfigInterface, fc);
-    return fc;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static SkFontConfigInterface* init_FCI() {
-    SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
-
-    if (gFontConfigInterface) {
-        return SkRef(gFontConfigInterface);
-    }
-    gFontConfigInterface = SkRef(SkFontConfigInterface::GetSingletonDirectInterface());
-    return gFontConfigInterface;
-}
+#ifdef SK_ADDING_src_ports_SkFontConfigInterface_cpp
+// The code previously here is moving to SkFontConfigInterface.cpp
+#include "SkFontConfigInterface.cpp"
+#endif
 
 SkFontMgr* SkFontMgr::Factory() {
-    SkFontConfigInterface* fci = init_FCI();
-    return fci ? SkFontMgr_New_FCI(fci) : nullptr;
+    sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
+    if (!fci) {
+        return nullptr;
+    }
+    return SkFontMgr_New_FCI(std::move(fci));
 }