Add getFamilyNames to SkTypeface.

include/core/SkTypeface.h

 
 /*
  * Copyright 2006 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.
  */
 
 
 #ifndef SkTypeface_DEFINED
@@ skipping 215 matching lines @@
     int getUnitsPerEm() const;
 
     struct LocalizedString {
         SkString fString;
         SkString fLanguage;
     };
     class LocalizedStrings : ::SkNoncopyable {
     public:
         virtual ~LocalizedStrings() { }
         virtual bool next(LocalizedString* localizedString) = 0;
+        void unref() { SkDELETE(this); }
     };
     /**
      *  Returns an iterator which will attempt to enumerate all of the
      *  family names specified by the font.
-     *  It is the caller's responsibility to SK_DELETE the returned pointer.
+     *  It is the caller's responsibility to unref() the returned pointer.
      */
-    LocalizedStrings* getFamilyNames() const;
+    LocalizedStrings* createFamilyNameIterator() const;
 
     /**
      *  Return the family name for this typeface. It will always be returned
      *  encoded as UTF8, but the language of the name is whatever the host
      *  platform chooses.
      */
     void getFamilyName(SkString* name) const;
 
     /**
      *  Return a stream for the contents of the font data, or NULL on failure.
@@ skipping 51 matching lines @@
                         uint32_t glyphIDsCount) const = 0;
     virtual SkStream* onOpenStream(int* ttcIndex) const = 0;
     virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0;
 
     virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
                                 int glyphCount) const;
     virtual int onCountGlyphs() const = 0;
 
     virtual int onGetUPEM() const = 0;
 
-    virtual LocalizedStrings* onGetFamilyNames() const = 0;
+    virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0;
 
     virtual int onGetTableTags(SkFontTableTag tags[]) const = 0;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const = 0;
 
     virtual SkTypeface* onRefMatchingStyle(Style styleBits) const = 0;
 
 private:
     SkFontID    fUniqueID;
     Style       fStyle;
     bool        fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
     // just so deprecated fonthost can call protected methods
     friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif