remove GetTable* APIs from SkFontHost, and rely on SkTypeface::onGetTable*

default impls call SkFontStream, and rely on SkTypeface::onOpenStream
Review URL: https://codereview.chromium.org/13001002

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

4 files changed, 5 insertions, 109 deletions

diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index ea0971018a..8cdca1e584 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -176,31 +176,6 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
 ///////////////////////////////////////////////////////////////////////////////
 
 // DEPRECATED
-int SkFontHost::CountTables(SkFontID fontID) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableTags(NULL) : 0;
-}
-
-// DEPRECATED
-int SkFontHost::GetTableTags(SkFontID fontID, SkFontTableTag tags[]) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableTags(tags) : 0;
-}
-
-// DEPRECATED
-size_t SkFontHost::GetTableSize(SkFontID fontID, SkFontTableTag tag) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableData(tag, 0, ~0U, NULL) : 0;
-}
-
-// DEPRECATED
-size_t SkFontHost::GetTableData(SkFontID fontID, SkFontTableTag tag,
-                                size_t offset, size_t length, void* dst) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableData(tag, offset, length, dst) : 0;
-}
-
-// DEPRECATED
 SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID curr, SkFontID orig) {
     // We don't handle font fallback.
     return NULL;
@@ -304,3 +279,4 @@ void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
     desc->setStyle(this->style());
     desc->setFamilyName(this->getFamilyName());
 }
+
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 9bc757cb9c..8f93c0e5d3 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1728,31 +1728,6 @@ SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID currFontID, SkFontID origFo
     return SkSafeRef(face);
 }
 
-// DEPRECATED
-int SkFontHost::CountTables(SkFontID fontID) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableTags(NULL) : 0;
-}
-
-// DEPRECATED
-int SkFontHost::GetTableTags(SkFontID fontID, SkFontTableTag tags[]) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableTags(tags) : 0;
-}
-
-// DEPRECATED
-size_t SkFontHost::GetTableSize(SkFontID fontID, SkFontTableTag tag) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableData(tag, 0, ~0U, NULL) : 0;
-}
-
-// DEPRECATED
-size_t SkFontHost::GetTableData(SkFontID fontID, SkFontTableTag tag,
-                                size_t offset, size_t length, void* dst) {
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    return face ? face->onGetTableData(tag, offset, length, dst) : 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ports/SkFontHost_tables.cpp b/src/ports/SkFontHost_tables.cpp
deleted file mode 100644
index 9ddf6c0db6..0000000000
--- a/src/ports/SkFontHost_tables.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkEndian.h"
-#include "SkFontHost.h"
-#include "SkFontStream.h"
-#include "SkStream.h"
-
-int SkFontHost::CountTables(SkFontID fontID) {
-    SkStream* stream = SkFontHost::OpenStream(fontID);
-    if (NULL == stream) {
-        return 0;
-    }
-
-    SkAutoUnref au(stream);
-    int ttcIndex = 0;
-    return SkFontStream::GetTableTags(stream, ttcIndex, NULL);
-}
-
-int SkFontHost::GetTableTags(SkFontID fontID, SkFontTableTag tags[]) {
-    SkStream* stream = SkFontHost::OpenStream(fontID);
-    if (NULL == stream) {
-        return 0;
-    }
-
-    SkAutoUnref au(stream);
-    int ttcIndex = 0;
-    return SkFontStream::GetTableTags(stream, ttcIndex, tags);
-}
-
-size_t SkFontHost::GetTableSize(SkFontID fontID, SkFontTableTag tag) {
-    SkStream* stream = SkFontHost::OpenStream(fontID);
-    if (NULL == stream) {
-        return 0;
-    }
-
-    SkAutoUnref au(stream);
-    int ttcIndex = 0;
-    return SkFontStream::GetTableData(stream, ttcIndex, tag, 0, ~0U, NULL);
-}
-
-size_t SkFontHost::GetTableData(SkFontID fontID, SkFontTableTag tag,
-                                size_t offset, size_t length, void* data) {
-    SkStream* stream = SkFontHost::OpenStream(fontID);
-    if (NULL == stream) {
-        return 0;
-    }
-
-    SkAutoUnref au(stream);
-    int ttcIndex = 0;
-    return SkFontStream::GetTableData(stream, ttcIndex, tag, offset, length, data);
-}
diff --git a/src/ports/SkHarfBuzzFont.cpp b/src/ports/SkHarfBuzzFont.cpp
index b5cd0f7f9e..4e6f48da0d 100644
--- a/src/ports/SkHarfBuzzFont.cpp
+++ b/src/ports/SkHarfBuzzFont.cpp
@@ -166,9 +166,9 @@ const HB_FontClass& SkHarfBuzzFont::GetFontClass() {
 HB_Error SkHarfBuzzFont::GetFontTableFunc(void* voidface, const HB_Tag tag,
                                           HB_Byte* buffer, HB_UInt* len) {
     SkHarfBuzzFont* font = reinterpret_cast<SkHarfBuzzFont*>(voidface);
-    uint32_t uniqueID = SkTypeface::UniqueID(font->getTypeface());
+    SkTypeface* typeface = font->getTypeface();
 
-    const size_t tableSize = SkFontHost::GetTableSize(uniqueID, tag);
+    const size_t tableSize = typeface->getTableSize(tag);
     if (!tableSize) {
         return HB_Err_Invalid_Argument;
     }
@@ -182,6 +182,7 @@ HB_Error SkHarfBuzzFont::GetFontTableFunc(void* voidface, const HB_Tag tag,
         // is this right, or should we just copy less than the full table?
         return HB_Err_Invalid_Argument;
     }
-    SkFontHost::GetTableData(uniqueID, tag, 0, tableSize, buffer);
+    typeface->getTableData(tag, 0, tableSize, buffer);
     return HB_Err_Ok;
 }
+