| Index: gm/fontmgr.cpp
|
| diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
|
| index a1e7ff2a6861cf27b608d4aa687548c51350cd05..be2b11a272fbf6f04d6f607d58c6d70417f8f649 100644
|
| --- a/gm/fontmgr.cpp
|
| +++ b/gm/fontmgr.cpp
|
| @@ -38,7 +38,11 @@ static SkScalar drawCharacter(SkCanvas* canvas, uint32_t character, SkScalar x,
|
| // find typeface containing the requested character and draw it
|
| SkString ch;
|
| ch.appendUnichar(character);
|
| +#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
|
| + SkTypeface* typeface = fm->matchFamilyStyleCharacter(fontName, fontStyle, &bpc47, 1, character);
|
| +#else
|
| SkTypeface* typeface = fm->matchFamilyStyleCharacter(fontName, fontStyle, bpc47, character);
|
| +#endif
|
| SkSafeUnref(paint.setTypeface(typeface));
|
| x = drawString(canvas, ch, x, y, paint) + 20;
|
|
|
|
|