[PDF] Use SkTypeface::countGlyphs instead of getAdvancedTypefaceMetrics

src/pdf/SkPDFDevice.cpp

Index: src/pdf/SkPDFDevice.cpp
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index db0825af3a9f39d19dcc2a009690484cd32e8137..3134efddfbee55e7a14add2391a0e0be5d8a630e 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -105,18 +105,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
 static size_t max_glyphid_for_typeface(SkTypeface* typeface) {
     SkAutoResolveDefaultTypeface autoResolve(typeface);
     typeface = autoResolve.get();
-
-    SkAdvancedTypefaceMetrics* metrics;
-    metrics = typeface->getAdvancedTypefaceMetrics(
-            SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
-            NULL, 0);
-
-    int lastGlyphID = 0;
-    if (metrics) {
-        lastGlyphID = metrics->fLastGlyphID;
-        metrics->unref();
-    }
-    return lastGlyphID;
+    return typeface->countGlyphs() + 1;

[bungeman-skia, 2013/07/12 19:30:41]

did you mean -1? If there are 4 glyphs, and they're numbered from 0, then the
last one is 3.

[vandebo (ex-Chrome), 2013/07/12 19:34:08]

Indeed. Fixed.

 }
 
 typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage;