Revert of Ensure that we use different glyph entries for regular and df text.

src/gpu/GrDistanceFieldTextContext.cpp

Index: src/gpu/GrDistanceFieldTextContext.cpp
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index 180c506e33d271176a2ea9e3325f63cf69279882..2a439da4f27e5743171f8338fbeadb7d4720f0ce 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -319,8 +319,7 @@
 
                 if (!this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
                                                      glyph.getSubXFixed(),
-                                                     glyph.getSubYFixed(),
-                                                     GrGlyph::kDistance_MaskStyle),
+                                                     glyph.getSubYFixed()),
                                        x, y, fontScaler)) {
                     // couldn't append, send to fallback
                     fallbackTxt.push_back_n(SkToInt(text-lastText), lastText);
@@ -349,8 +348,7 @@
 
                 if (!this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
                                                      glyph.getSubXFixed(),
-                                                     glyph.getSubYFixed(),
-                                                     GrGlyph::kDistance_MaskStyle),
+                                                     glyph.getSubYFixed()),
                                        x - advanceX, y - advanceY, fontScaler)) {
                     // couldn't append, send to fallback
                     fallbackTxt.push_back_n(SkToInt(text-lastText), lastText);
@@ -511,7 +509,7 @@
     }
 
     if (NULL == fStrike) {
-        fStrike = fContext->getFontCache()->getStrike(scaler);
+        fStrike = fContext->getFontCache()->getStrike(scaler, true);
     }
 
     GrGlyph* glyph = fStrike->getGlyph(packed, scaler);