Chromium Code Reviews| Index: src/fonts/SkTestScalerContext.cpp |
| diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp |
| index ed98dba19e757b626d9f25c0c989128c0d0ef716..194cd0907c21aeb48b157bd00e5bc7a665bad66b 100644 |
| --- a/src/fonts/SkTestScalerContext.cpp |
| +++ b/src/fonts/SkTestScalerContext.cpp |
| @@ -145,11 +145,13 @@ SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics( |
| uint32_t glyphIDsCount) const { |
| // pdf only |
| SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics; |
| + info->fFontName.set(fTestFont->fName); |
| + info->fType = SkAdvancedTypefaceMetrics::kOther_Font; |
| + info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag; |
| + info->fLastGlyphID = static_cast<uint16_t>(fTestFont->fCharCodesCount - 1); |
| info->fEmSize = 0; |
| info->fLastGlyphID = SkToU16(onCountGlyphs() - 1); |
|
hal.canary
2015/06/11 15:55:44
info->fLastGlyphID gets set twice.
|
| info->fStyle = 0; |
| - info->fFontName.set(fTestFont->fName); |
| - info->fType = SkAdvancedTypefaceMetrics::kOther_Font; |
| info->fItalicAngle = 0; |
| info->fAscent = 0; |
| info->fDescent = 0; |