Reverting r10589: Add getFamilyNames to SkTypeface

git-svn-id: http://skia.googlecode.com/svn/trunk@10590 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 0 insertions, 42 deletions

diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp
index 004a888310..c7716fffd5 100644
--- a/src/sfnt/SkOTUtils.cpp
+++ b/src/sfnt/SkOTUtils.cpp
@@ -159,45 +159,3 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font
 
     return rewrittenFontData.detach();
 }
-
-
-SkOTUtils::LocalizedStrings_NameTable*
-SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(const SkTypeface& typeface) {
-    static const SkFontTableTag nameTag = SkSetFourByteTag('n','a','m','e');
-    size_t nameTableSize = typeface.getTableSize(nameTag);
-    if (0 == nameTableSize) {
-        return NULL;
-    }
-    SkAutoTDeleteArray<uint8_t> nameTableData(new uint8_t[nameTableSize]);
-    size_t copied = typeface.getTableData(nameTag, 0, nameTableSize, nameTableData.get());
-    if (copied != nameTableSize) {
-        return NULL;
-    }
-
-    return new SkOTUtils::LocalizedStrings_NameTable((SkOTTableName*)nameTableData.detach(),
-        SkOTUtils::LocalizedStrings_NameTable::familyNameTypes,
-        SK_ARRAY_COUNT(SkOTUtils::LocalizedStrings_NameTable::familyNameTypes));
-}
-
-bool SkOTUtils::LocalizedStrings_NameTable::next(SkTypeface::LocalizedString* localizedString) {
-    do {
-        SkOTTableName::Iterator::Record record;
-        if (fFamilyNameIter.next(record)) {
-            localizedString->fString = record.name;
-            localizedString->fLanguage = record.language;
-            return true;
-        }
-        if (fTypesCount == fTypesIndex + 1) {
-            return false;
-        }
-        ++fTypesIndex;
-        fFamilyNameIter.reset(fTypes[fTypesIndex]);
-    } while (true);
-}
-
-SkOTTableName::Record::NameID::Predefined::Value
-SkOTUtils::LocalizedStrings_NameTable::familyNameTypes[3] = {
-    SkOTTableName::Record::NameID::Predefined::FontFamilyName,
-    SkOTTableName::Record::NameID::Predefined::PreferredFamily,
-    SkOTTableName::Record::NameID::Predefined::WWSFamilyName,
-};