[PDF] Use SkTypeface::countGlyphs instead of getAdvancedTypefaceMetrics

resubmit r10063

BUG=1088
R=bungeman@google.com

Author: vandebo@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19668002

git-svn-id: http://skia.googlecode.com/svn/trunk@10133 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index db0825a..a8fc399 100644 (file)
--- 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;
 }
 
 typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage;