Split SkFontConfigInterface globals and factory.

src/ports/SkFontMgr_FontConfigInterface.cpp

 /*
  * Copyright 2013 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 "SkFontConfigTypeface.h"
 #include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
+#include "SkFontMgr_FontConfigInterface.h"
 #include "SkFontStyle.h"
 #include "SkMakeUnique.h"
 #include "SkMutex.h"
 #include "SkString.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
 #include "SkResourceCache.h"
 
 SkStreamAsset* SkTypeface_FCI::onOpenStream(int* ttcIndex) const {
     *ttcIndex =  this->getIdentity().fTTCIndex;
@@ skipping 123 matching lines @@
     typedef SkFontConfigInterface::FontIdentity FontIdentity;
     SkTypeface_FCI* cachedFCTypeface = static_cast<SkTypeface_FCI*>(cachedTypeface);
     FontIdentity* identity = static_cast<FontIdentity*>(ctx);
 
     return cachedFCTypeface->getIdentity() == *identity;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkFontMgr_FCI : public SkFontMgr {
-    SkAutoTUnref<SkFontConfigInterface> fFCI;
+    sk_sp<SkFontConfigInterface> fFCI;
     sk_sp<SkDataTable> fFamilyNames;
     SkTypeface_FreeType::Scanner fScanner;
 
     mutable SkMutex fMutex;
     mutable SkTypefaceCache fTFCache;
 
     // The value of maxSize here is a compromise between cache hits and cache size.
     // See https://crbug.com/424082#63 for reason for current size.
     static const size_t kMaxSize = 1 << 15;
     mutable SkFontRequestCache fCache;
 
 public:
-    SkFontMgr_FCI(SkFontConfigInterface* fci)
-        : fFCI(fci)
+    SkFontMgr_FCI(sk_sp<SkFontConfigInterface> fci)
+        : fFCI(std::move(fci))
         , fFamilyNames(fFCI->getFamilyNames())
         , fCache(kMaxSize)
     {}
 
 protected:
     int onCountFamilies() const override {
         return fFamilyNames->count();
     }
 
     void onGetFamilyName(int index, SkString* familyName) const override {
@@ skipping 108 matching lines @@
             // Add this FontIdentity to the FontIdentity cache.
             fTFCache.add(face);
         }
         // Add this request to the request cache.
         fCache.add(face, request.release());
 
         return face;
     }
 };
 
-SK_API SkFontMgr* SkFontMgr_New_FCI(SkFontConfigInterface* fci) {
+SK_API SkFontMgr* SkFontMgr_New_FCI(sk_sp<SkFontConfigInterface> fci) {
     SkASSERT(fci);
-    return new SkFontMgr_FCI(fci);
+    return new SkFontMgr_FCI(std::move(fci));
 }