From f7af91bd79daf7e090bd6ae1d080ad7a4964e477 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 7 Aug 2013 15:56:51 +0000 Subject: 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 --- src/ports/SkFontHost_FreeType.cpp | 2 +- src/ports/SkFontHost_FreeType_common.h | 2 +- src/ports/SkFontHost_mac.cpp | 4 ++-- src/ports/SkFontHost_win.cpp | 4 ++-- src/ports/SkFontHost_win_dw.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 3a8a1ae207..c5542a9ddf 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1403,7 +1403,7 @@ int SkTypeface_FreeType::onCountGlyphs() const { return fGlyphCount; } -SkTypeface::LocalizedStrings* SkTypeface_FreeType::onCreateFamilyNameIterator() const { +SkTypeface::LocalizedStrings* SkTypeface_FreeType::onGetFamilyNames() const { SkTypeface::LocalizedStrings* nameIter = SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this); if (NULL == nameIter) { diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index c0f2dc7553..5c069d042d 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -64,7 +64,7 @@ protected: int glyphCount) const SK_OVERRIDE; virtual int onCountGlyphs() const SK_OVERRIDE; - virtual LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + virtual LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE; virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 987f185101..9600730f67 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -454,7 +454,7 @@ protected: virtual int onGetUPEM() const SK_OVERRIDE; virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE; virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; @@ -1750,7 +1750,7 @@ int SkTypeface_Mac::onGetUPEM() const { return CGFontGetUnitsPerEm(cgFont); } -SkTypeface::LocalizedStrings* SkTypeface_Mac::onCreateFamilyNameIterator() const { +SkTypeface::LocalizedStrings* SkTypeface_Mac::onGetFamilyNames() const { SkTypeface::LocalizedStrings* nameIter = SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this); if (NULL == nameIter) { diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 708c66fdf7..d52774ca6d 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -268,7 +268,7 @@ protected: virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual int onCountGlyphs() const SK_OVERRIDE; virtual int onGetUPEM() const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE; virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; @@ -2056,7 +2056,7 @@ int LogFontTypeface::onGetUPEM() const { return upem; } -SkTypeface::LocalizedStrings* LogFontTypeface::onCreateFamilyNameIterator() const { +SkTypeface::LocalizedStrings* LogFontTypeface::onGetFamilyNames() const { SkTypeface::LocalizedStrings* nameIter = SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this); if (NULL == nameIter) { diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 5df90b47f3..cee8b362b2 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -495,7 +495,7 @@ protected: virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual int onCountGlyphs() const SK_OVERRIDE; virtual int onGetUPEM() const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE; virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; @@ -1130,7 +1130,7 @@ private: SkTScopedComPtr fStrings; }; -SkTypeface::LocalizedStrings* DWriteFontTypeface::onCreateFamilyNameIterator() const { +SkTypeface::LocalizedStrings* DWriteFontTypeface::onGetFamilyNames() const { SkTScopedComPtr familyNames; HRNM(fDWriteFontFamily->GetFamilyNames(&familyNames), "Could not obtain family names."); -- cgit v1.2.3