diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 15:56:51 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 15:56:51 +0000 |
| commit | f7af91bd79daf7e090bd6ae1d080ad7a4964e477 (patch) | |
| tree | 0be8e8411705ba7bf2d1327a46785d30a4c81c1a /include | |
| parent | 246b1c266f2b0111aa58016829cf17de82614803 (diff) | |
Reverting r10608 (Add getFamilyNames to SkTypeface) due to compilation failures
git-svn-id: http://skia.googlecode.com/svn/trunk@10609 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkTypeface.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index ca88a1bc76..a2bef4b40f 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -233,14 +233,13 @@ public: 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 unref() the returned pointer. + * It is the caller's responsibility to SK_DELETE the returned pointer. */ - LocalizedStrings* createFamilyNameIterator() const; + LocalizedStrings* getFamilyNames() const; /** * Return the family name for this typeface. It will always be returned @@ -312,7 +311,7 @@ protected: virtual int onGetUPEM() const = 0; - virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0; + virtual LocalizedStrings* onGetFamilyNames() const = 0; virtual int onGetTableTags(SkFontTableTag tags[]) const = 0; virtual size_t onGetTableData(SkFontTableTag, size_t offset, |