commit b3b465567db95e4ffa70aa5b5b06a6aa43b379a8
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 17 23:22:49 2011 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 17 23:22:49 2011 +0000
tree 135ddc1a8a3a4ac02c2ff21422dac0f93e5ce7e6
parent ec4400824c33f2b354a1c8be8951a0d0120545f1

Handle failure of GetAdvancedTypefaceMetrics gracefully until we can figure out why it is failing.

Code from arthurhsu@chromium.org.  Original CL: http://codereview.appspot.com/5276057/

Review URL: http://codereview.appspot.com/5274051

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

src/pdf/SkPDFFont.cpp

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index fe55c8d..5d358cb 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -759,7 +759,6 @@
     SkPDFDict* relatedFontDescriptor = NULL;
     if (relatedFontIndex >= 0) {
         SkPDFFont* relatedFont = CanonicalFonts()[relatedFontIndex].fFont;
-        SkASSERT(relatedFont->fFontInfo.get());
         fontMetrics = relatedFont->fontInfo();
         relatedFontDescriptor = relatedFont->getFontDescriptor();
     } else {
@@ -775,7 +774,8 @@
             SkFontHost::GetAdvancedTypefaceMetrics(fontID, info, NULL, 0);
 #if defined (SK_SFNTLY_SUBSETTER)
         SkSafeUnref(fontMetrics.get());  // SkRefPtr and Get both took a ref.
-        if (fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) {
+        if (fontMetrics &&
+            fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) {
             // Font does not support subsetting, get new info with advance.
             info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
                       info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);