commit 39a9a5069b25aa8b9529118cfd0ece5f412fb56b
author reed <reed@google.com> Tue May 12 09:50:04 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue May 12 09:50:04 2015 -0700
tree 6857910652952189574c5f3df7425b06db7caed9
parent 67d71c898249a7af3523b16c6a69895a63bfae0a

Make SkAdvancedTypefaceMetrics private.

Review URL: https://codereview.chromium.org/1129283003

src/ports/SkTypeface_win_dw.cpp

diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index f445578..cf45c16 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -322,7 +322,7 @@
 }
 
 SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
 
@@ -355,7 +355,7 @@
 
     hr = sk_wchar_to_skstring(familyName.get(), familyNameLen, &info->fFontName);
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo) {
+    if (perGlyphInfo & kToUnicode_PerGlyphInfo) {
         populate_glyph_to_unicode(fDWriteFontFace.get(), glyphCount, &(info->fGlyphToUnicode));
     }
 
@@ -442,7 +442,7 @@
     }
     */
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) {
+    if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (fixedWidth) {
             appendRange(&info->fGlyphWidths, 0);
             int16_t advance;