commit 4d71db85301f2d47874b43c4496c26cf21bba107
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 02 19:10:02 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 02 19:10:02 2013 +0000
tree b42ff5e93c180686b3997571d52c0c828e723c0e
parent c932c9fd77503aec47c256818dd94a8b57219a43

Actually mark other types of fonts as 'kOther' in FreeType port.

Without this, the fType is garbage and will most likely cause an assert
or unwanted behavior later.

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

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

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index f4ec420..fd87a66 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -516,6 +516,8 @@
                                                       ft_sfnt_head)) != NULL) {
             info->fEmSize = ttHeader->Units_Per_EM;
         }
+    } else {
+        info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
     }
 
     info->fStyle = 0;