Make SkAdvancedTypefaceMetrics private.

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
 #include "SkPath.h"
@@ skipping 160 matching lines @@
     return SkNEW_ARGS(SkGScalerContext, (const_cast<SkGTypeface*>(this), desc));
 }
 
 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
     fProxy->filterRec(rec);
     rec->setHinting(SkPaint::kNo_Hinting);
     rec->fMaskFormat = SkMask::kARGB32_Format;
 }
 
 SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo info,
+                                PerGlyphInfo info,
                                 const uint32_t* glyphIDs,
                                 uint32_t glyphIDsCount) const {
     return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
 }
 
 SkStreamAsset* SkGTypeface::onOpenStream(int* ttcIndex) const {
     return fProxy->openStream(ttcIndex);
 }
 
 void SkGTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
@@ skipping 65 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif