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

trunk/src/core/SkTypeface.cpp

 
 /*
  * Copyright 2011 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 "SkAdvancedTypefaceMetrics.h"
@@ skipping 88 matching lines @@
 SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
                                 SkAdvancedTypefaceMetrics::PerGlyphInfo info,
                                 const uint32_t* glyphIDs,
                                 uint32_t glyphIDsCount) const {
     return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkTypeface::countTables() const {
-    return SkFontHost::CountTables(fUniqueID);
+    return this->onGetTableTags(NULL);
 }
 
 int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
-    return SkFontHost::GetTableTags(fUniqueID, tags);
+    return this->onGetTableTags(tags);
 }
 
 size_t SkTypeface::getTableSize(SkFontTableTag tag) const {
-    return SkFontHost::GetTableSize(fUniqueID, tag);
+    return this->onGetTableData(tag, 0, ~0U, NULL);
 }
 
 size_t SkTypeface::getTableData(SkFontTableTag tag, size_t offset, size_t length,
                                 void* data) const {
-    return SkFontHost::GetTableData(fUniqueID, tag, offset, length, data);
+    return this->onGetTableData(tag, offset, length, data);
 }
 
 SkStream* SkTypeface::openStream(int* ttcIndex) const {
     int ttcIndexStorage;
     if (NULL == ttcIndex) {
         // So our subclasses don't need to check for null param
         ttcIndex = &ttcIndexStorage;
     }
     return this->onOpenStream(ttcIndex);
 }
@@ skipping 24 matching lines @@
 
 SkStream* SkTypeface::onOpenStream(int* ttcIndex) const {
     if (ttcIndex) {
         int32_t ndx = 0;
         (void)SkFontHost::GetFileName(fUniqueID, NULL, 0, &ndx);
         *ttcIndex = (int)ndx;
     }
     return SkFontHost::OpenStream(fUniqueID);
 }
 
-int SkTypeface::onGetTableTags(SkFontTableTag tags[]) const { return 0; }
-size_t SkTypeface::onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const { return 0; }
 void SkTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
     desc->setStyle(this->style());
 }
 
+#include "SkFontStream.h"
+#include "SkStream.h"
+
+int SkTypeface::onGetTableTags(SkFontTableTag tags[]) const {
+    int ttcIndex;
+    SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
+    return stream.get() ? SkFontStream::GetTableTags(stream, ttcIndex, tags) : 0;
+}
+
+size_t SkTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
+                                  size_t length, void* data) const {
+    int ttcIndex;
+    SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
+    return stream.get()
+        ? SkFontStream::GetTableData(stream, ttcIndex, tag, offset, length, data)
+        : 0;
+}
+