Remove SkRefPtr.

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 35 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef int32_t FontRecID;
 #define INVALID_FONT_REC_ID -1
 
 typedef int32_t FamilyRecID;
 #define INVALID_FAMILY_REC_ID -1
 
 // used to record our notion of the pre-existing fonts
 struct FontRec {
-    SkRefPtr<SkTypeface> fTypeface;
+    SkAutoTUnref<SkTypeface> fTypeface;
     SkString fFileName;
     SkTypeface::Style fStyle;
     bool fIsValid;
     FamilyRecID fFamilyRecID;
 };
 
 struct FamilyRec {
     FamilyRec() {
         memset(fFontRecID, INVALID_FONT_REC_ID, sizeof(fFontRecID));
     }
@@ skipping 41 matching lines @@
     SkTypeface* getTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
                                       const SkPaintOptionsAndroid& options,
                                       int* lowerBounds, int* upperBounds);
 
 private:
     void addFallbackFamily(FamilyRecID fontRecID);
     SkTypeface* getTypefaceForFontRec(FontRecID fontRecID);
     FallbackFontList* getCurrentLocaleFallbackFontList();
     FallbackFontList* findFallbackFontList(const SkLanguage& lang, bool isOriginal = true);
 
-    SkTArray<FontRec> fFonts;
-    SkTArray<FamilyRec> fFontFamilies;
+    SkTArray<FontRec, true> fFonts;
+    SkTArray<FamilyRec, true> fFontFamilies;
     SkTDict<FamilyRecID> fFamilyNameDict;
     FamilyRecID fDefaultFamilyRecID;
 
     // (SkLanguage)<->(fallback chain index) translation
     SkTDict<FallbackFontList*> fFallbackFontDict;
     SkTDict<FallbackFontList*> fFallbackFontAliasDict;
     FallbackFontList fDefaultFallbackList;
 
     // fallback info for current locale
     SkString fCachedLocale;
@@ skipping 26 matching lines @@
     return gFontConfigInterface;
 }
 
 SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex*) {
     // Doesn't need passed-in mutex because getSingletonInterface() uses one
     return getSingletonInterface();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static bool has_font(const SkTArray<FontRec>& array, const SkString& filename) {
+static bool has_font(const SkTArray<FontRec, true>& array, const SkString& filename) {
     for (int i = 0; i < array.count(); i++) {
         if (array[i].fFileName == filename) {
             return true;
         }
     }
     return false;
 }
 
 #ifndef SK_FONT_FILE_PREFIX
     #define SK_FONT_FILE_PREFIX          "/fonts/"
@@ skipping 319 matching lines @@
 
         // if it is not in the cache then create it
         if (!face) {
             const char* familyName = NULL;
             SkAssertResult(fFamilyNameDict.findKey(fontRec.fFamilyRecID, &familyName));
             SkASSERT(familyName);
             face = SkTypeface::CreateFromName(familyName, fontRec.fStyle);
         }
 
         // store the result for subsequent lookups
-        fontRec.fTypeface = face;
+        fontRec.fTypeface.reset(face);
     }
     SkASSERT(face);
     return face;
 }
 
 bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni,
                                                                 const char* lang,
                                                                 SkString* name) {
     FallbackFontList* fallbackFontList = NULL;
     const SkString langTag(lang);
@@ skipping 388 matching lines @@
     return SkSafeRef(retTypeface);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }