diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-13 17:24:30 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-13 17:24:30 +0000 |
| commit | 000e13ef161a87befdf0d6aa197a337031475d1a (patch) | |
| tree | 52e6852797d678be60a7e28c9da81a64559b5362 /src/pdf/SkPDFDevice.cpp | |
| parent | 42dacab4e7366d9f53989558cc8d045c3d065bcd (diff) | |
[PDF] Use SkTypeface::countGlyphs instead of getAdvancedTypefaceMetrics
BUG=1088
R=bungeman@google.com
Author: vandebo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18886005
git-svn-id: http://skia.googlecode.com/svn/trunk@10063 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf/SkPDFDevice.cpp')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index db0825af3a..a8fc3990d8 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; } typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage; |