move impl of AdvancedTypefaceMetrics into typeface (3)

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 79 matching lines @@
 
 void SkTypeface::serialize(SkWStream* stream) const {
     SkFontHost::Serialize(this, stream);
 }
 
 SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
     return SkFontHost::Deserialize(stream);
 }
 
 SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
-        const uint32_t* glyphIDs,
-        uint32_t glyphIDsCount) const {
-    return SkFontHost::GetAdvancedTypefaceMetrics(fUniqueID,
-                                                  perGlyphInfo,
-                                                  glyphIDs,
-                                                  glyphIDsCount);
+                                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);
 }
 
 int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
     return SkFontHost::GetTableTags(fUniqueID, tags);
@@ skipping 17 matching lines @@
     return SkFontHost::OpenStream(fUniqueID);
 }
 
 int SkTypeface::getUnitsPerEm() const {
     int upem = 0;
 
 #ifdef SK_BUILD_FOR_ANDROID
     upem = SkFontHost::GetUnitsPerEm(fUniqueID);
 #else
     SkAdvancedTypefaceMetrics* metrics;
-    metrics = SkFontHost::GetAdvancedTypefaceMetrics(fUniqueID,
+    metrics = this->getAdvancedTypefaceMetrics(
                                  SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
                                  NULL, 0);
     if (metrics) {
         upem = metrics->fEmSize;
         metrics->unref();
     }
 #endif
     return upem;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkFontDescriptor.h"
 
 int SkTypeface::onGetUPEM() const { return 0; }
 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());
 }