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

trunk/src/ports/SkHarfBuzzFont.cpp

 
 /*
  * Copyright 2009 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.
  */
 
 
 #include "SkHarfBuzzFont.h"
@@ skipping 148 matching lines @@
     getFontMetric,
 };
 
 const HB_FontClass& SkHarfBuzzFont::GetFontClass() {
     return gSkHarfBuzzFontClass;
 }
 
 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;
     }
     // If Harfbuzz specified a NULL buffer then it's asking for the size.
     if (!buffer) {
         *len = tableSize;
         return HB_Err_Ok;
     }
 
     if (*len < tableSize) {
         // 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;
 }
+