Revert of refactor emboldenGlyph

src/ports/SkFontHost_FreeType_common.cpp

 /*
  * Copyright 2006-2012 The Android Open Source Project
  * Copyright 2012 Mozilla Foundation
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 326 matching lines @@
 void SkScalerContext_FreeType_Base::generateGlyphImage(FT_Face face, const SkGlyph& glyph) {
     const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag);
     const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);
 
     switch ( face->glyph->format ) {
         case FT_GLYPH_FORMAT_OUTLINE: {
             FT_Outline* outline = &face->glyph->outline;
             FT_BBox     bbox;
             FT_Bitmap   target;
 
+            if (fRec.fFlags & SkScalerContext::kEmbolden_Flag &&
+                !(face->style_flags & FT_STYLE_FLAG_BOLD)) {
+                emboldenOutline(face, outline);
+            }
+
             int dx = 0, dy = 0;
             if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
                 dx = SkFixedToFDot6(glyph.getSubXFixed());
                 dy = SkFixedToFDot6(glyph.getSubYFixed());
                 // negate dy since freetype-y-goes-up and skia-y-goes-down
                 dy = -dy;
             }
             FT_Outline_Get_CBox(outline, &bbox);
             /*
                 what we really want to do for subpixel is
@@ skipping 178 matching lines @@
     SkPath* path = (SkPath*)ctx;
     path->cubicTo(SkFDot6ToScalar(pt0->x), -SkFDot6ToScalar(pt0->y),
                   SkFDot6ToScalar(pt1->x), -SkFDot6ToScalar(pt1->y),
                   SkFDot6ToScalar(pt2->x), -SkFDot6ToScalar(pt2->y));
     return 0;
 }
 
 void SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face,
                                                       SkPath* path)
 {
+    if (fRec.fFlags & SkScalerContext::kEmbolden_Flag) {
+        emboldenOutline(face, &face->glyph->outline);
+    }
+
     FT_Outline_Funcs    funcs;
 
     funcs.move_to   = move_proc;
     funcs.line_to   = line_proc;
     funcs.conic_to  = quad_proc;
     funcs.cubic_to  = cubic_proc;
     funcs.shift     = 0;
     funcs.delta     = 0;
 
     FT_Error err = FT_Outline_Decompose(&face->glyph->outline, &funcs, path);
 
     if (err != 0) {
         path->reset();
         return;
     }
 
     path->close();
 }
+
+void SkScalerContext_FreeType_Base::emboldenOutline(FT_Face face, FT_Outline* outline)
+{
+    FT_Pos strength;
+    strength = FT_MulFix(face->units_per_EM, face->size->metrics.y_scale)
+               / 24;
+    FT_Outline_Embolden(outline, strength);
+}