Make fID and MixedID calculations private

src/fonts/SkTestScalerContext.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDescriptor.h"
@@ skipping 99 matching lines @@
         fPaths[index] = path;
     }
 }
 
 SkTestTypeface::SkTestTypeface(SkTestFont* testFont, const SkFontStyle& style)
     : SkTypeface(style, SkTypefaceCache::NewFontID(), false)
     , fTestFont(testFont) {
 }
 
 void SkTestTypeface::getAdvance(SkGlyph* glyph) {
-    glyph->fAdvanceX = fTestFont->fWidths[SkGlyph::ID2Code(glyph->fID)];
+    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
     glyph->fAdvanceY = 0;
 }
 
 void SkTestTypeface::getFontMetrics(SkPaint::FontMetrics* metrics) {
     *metrics = fTestFont->fMetrics;
 }
 
 void SkTestTypeface::getMetrics(SkGlyph* glyph) {
-    glyph->fAdvanceX = fTestFont->fWidths[SkGlyph::ID2Code(glyph->fID)];
+    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
     glyph->fAdvanceY = 0;
 }
 
 void SkTestTypeface::getPath(const SkGlyph& glyph, SkPath* path) {
-    *path = *fTestFont->fPaths[SkGlyph::ID2Code(glyph.fID)];
+    *path = *fTestFont->fPaths[glyph.getGlyphID()];
 }
 
 void SkTestTypeface::onFilterRec(SkScalerContextRec* rec) const {
     rec->setHinting(SkPaint::kNo_Hinting);
     rec->fMaskFormat = SkMask::kA8_Format;
 }
 
 SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics(
                                 SkAdvancedTypefaceMetrics::PerGlyphInfo ,
                                 const uint32_t* glyphIDs,
@@ skipping 143 matching lines @@
     }
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
     return SkNEW_ARGS(SkTestScalerContext, (const_cast<SkTestTypeface*>(this), desc));
 }