Chromium Code Reviews| Index: src/ports/SkFontHost_FreeType.cpp |
| diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp |
| index fce8259a39ce40e8affbd1b5ec1189ddf338555d..a6d751cf2d05b4abf0c44f7a50f1823f1d6a55d7 100644 |
| --- a/src/ports/SkFontHost_FreeType.cpp |
| +++ b/src/ports/SkFontHost_FreeType.cpp |
| @@ -1497,21 +1497,31 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx, |
| void SkScalerContext_FreeType::emboldenIfNeeded(FT_Face face, FT_GlyphSlot glyph) |
| { |
| - if (fRec.fFlags & SkScalerContext::kEmbolden_Flag) { |
| - switch ( glyph->format ) { |
| - case FT_GLYPH_FORMAT_OUTLINE: |
| - FT_Pos strength; |
| - strength = FT_MulFix(face->units_per_EM, face->size->metrics.y_scale) / 24; |
| - FT_Outline_Embolden(&glyph->outline, strength); |
| - break; |
| - case FT_GLYPH_FORMAT_BITMAP: |
| - FT_GlyphSlot_Own_Bitmap(glyph); |
| - FT_Bitmap_Embolden(glyph->library, &glyph->bitmap, kBitmapEmboldenStrength, 0); |
| - break; |
| - default: |
| - SkDEBUGFAIL("unknown glyph format"); |
| - } |
| + // check to see if the embolden bit is set |
| + if (0 == (fRec.fFlags & SkScalerContext::kEmbolden_Flag)) { |
| + return; |
| } |
| + |
| +#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) |
| + // Android doesn't want to embolden a font that is already bold. |
| + if ((fFace->style_flags & FT_STYLE_FLAG_BOLD)) { |
| + return; |
| + } |
| +#endif |
| + |
| + switch ( glyph->format ) { |
| + case FT_GLYPH_FORMAT_OUTLINE: |
|
scroggo
2014/04/01 17:46:23
4 space indents (here and below)
djsollen
2014/04/01 17:55:06
Done.
|
| + FT_Pos strength; |
| + strength = FT_MulFix(face->units_per_EM, face->size->metrics.y_scale) / 24; |
| + FT_Outline_Embolden(&glyph->outline, strength); |
| + break; |
| + case FT_GLYPH_FORMAT_BITMAP: |
| + FT_GlyphSlot_Own_Bitmap(glyph); |
| + FT_Bitmap_Embolden(glyph->library, &glyph->bitmap, kBitmapEmboldenStrength, 0); |
|
scroggo
2014/04/01 17:46:23
Once you have spacing fixed, this shouldn't be 100
|
| + break; |
| + default: |
| + SkDEBUGFAIL("unknown glyph format"); |
| + } |
| } |
| /////////////////////////////////////////////////////////////////////////////// |