Colored Emoji not drawn in Chrome if font style is set as Bold

src/ports/SkFontHost_FreeType.cpp

Index: src/ports/SkFontHost_FreeType.cpp
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index e2b0fe9ae6b9f640bed76ea3d86b671602098d12..5ebe483af2393a98b24b17b6eb21409aa7657329 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1022,6 +1022,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
         if (fStrikeIndex == -1) {
             SkDEBUGF(("no glyphs for font \"%s\" size %f?\n",
                             fFace->family_name,       SkFixedToScalar(fScaleY)));
+            updateImageFromPath(true);

[reed1, 2014/09/05 13:29:42]

nit: prefix method calls with this->

[h.joshi, 2014/09/05 14:06:31]

Done.

         } else {
             // FreeType does no provide linear metrics for bitmap fonts.
             linearMetrics = false;
@@ -1033,6 +1034,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
             // However, in FreeType 2.5.1 color bitmap only fonts do not ignore this flag.
             // Force this flag off for bitmap only fonts.
             fLoadGlyphFlags &= ~FT_LOAD_NO_BITMAP;
+            updateImageFromPath(false);
         }
     } else {
         SkDEBUGF(("unknown kind of font \"%s\" size %f?\n",
@@ -1260,8 +1262,10 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
         }
 
         if (fFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
+            updateImageFromPath(false);
             glyph->fMaskFormat = SkMask::kARGB32_Format;
-        }
+        } else
+            updateImageFromPath(true);
 
         glyph->fWidth   = SkToU16(fFace->glyph->bitmap.width);
         glyph->fHeight  = SkToU16(fFace->glyph->bitmap.rows);