| Index: gm/fontmgr.cpp
 | 
| diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
 | 
| index ee3805c29f3e39d48ef345164a316697f704a85e..efd01c5ca9fc7cce7d96a88553b74c61d7bdf721 100644
 | 
| --- a/gm/fontmgr.cpp
 | 
| +++ b/gm/fontmgr.cpp
 | 
| @@ -45,11 +45,7 @@ static SkScalar drawCharacter(SkCanvas* canvas, uint32_t character, SkScalar x,
 | 
|      // it expects to get the same glyph when following this pattern.
 | 
|      SkString familyName;
 | 
|      typeface->getFamilyName(&familyName);
 | 
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
 | 
| -    SkTypeface* typefaceCopy = fm->legacyCreateTypeface(familyName.c_str(), typeface->style());
 | 
| -#else
 | 
|      SkTypeface* typefaceCopy = fm->legacyCreateTypeface(familyName.c_str(), typeface->fontStyle());
 | 
| -#endif
 | 
|      SkSafeUnref(paint.setTypeface(typefaceCopy));
 | 
|      return drawString(canvas, ch, x, y, paint) + 20;
 | 
|  }
 | 
| 
 |