Revert of Make fID and MixedID calculations private

src/fonts/SkTestScalerContext.cpp

Index: src/fonts/SkTestScalerContext.cpp
diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp
index fc1f9456e25dd4c5a5513a39988e60644f99d961..b9aa6c7de6203e7d6383f159b37e92a01d97a7ea 100644
--- a/src/fonts/SkTestScalerContext.cpp
+++ b/src/fonts/SkTestScalerContext.cpp
@@ -117,7 +117,7 @@
 }
 
 void SkTestTypeface::getAdvance(SkGlyph* glyph) {
-    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
+    glyph->fAdvanceX = fTestFont->fWidths[SkGlyph::ID2Code(glyph->fID)];
     glyph->fAdvanceY = 0;
 }
 
@@ -126,12 +126,12 @@
 }
 
 void SkTestTypeface::getMetrics(SkGlyph* glyph) {
-    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
+    glyph->fAdvanceX = fTestFont->fWidths[SkGlyph::ID2Code(glyph->fID)];
     glyph->fAdvanceY = 0;
 }
 
 void SkTestTypeface::getPath(const SkGlyph& glyph, SkPath* path) {
-    *path = *fTestFont->fPaths[glyph.getGlyphID()];
+    *path = *fTestFont->fPaths[SkGlyph::ID2Code(glyph.fID)];
 }
 
 void SkTestTypeface::onFilterRec(SkScalerContextRec* rec) const {