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

src/gpu/GrGlyph.h

Index: src/gpu/GrGlyph.h
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
index 108f2f0fe7d5df231a8337da7090d0d72f553a7e..0e534d694afe1fb7c1ef2b518d83938c4910a0bf 100644
--- a/src/gpu/GrGlyph.h
+++ b/src/gpu/GrGlyph.h
@@ -23,11 +23,6 @@
     - failed to get metrics
  */
 struct GrGlyph {
-    enum MaskStyle {
-        kCoverage_MaskStyle,
-        kDistance_MaskStyle
-    };
-    
     typedef uint32_t PackedID;
 
     GrPlot*      fPlot;
@@ -65,11 +60,10 @@
         return (pos >> 14) & 3;
     }
 
-    static inline PackedID Pack(uint16_t glyphID, SkFixed x, SkFixed y, MaskStyle ms) {
+    static inline PackedID Pack(uint16_t glyphID, SkFixed x, SkFixed y) {
         x = ExtractSubPixelBitsFromFixed(x);
         y = ExtractSubPixelBitsFromFixed(y);
-        int dfFlag = (ms == kDistance_MaskStyle) ? 0x1 : 0x0;
-        return (dfFlag << 20) | (x << 18) | (y << 16) | glyphID;
+        return (x << 18) | (y << 16) | glyphID;
     }
 
     static inline SkFixed UnpackFixedX(PackedID packed) {
@@ -80,10 +74,6 @@
         return ((packed >> 16) & 3) << 14;
     }
 
-    static inline MaskStyle UnpackMaskStyle(PackedID packed) {
-        return ((packed >> 20) & 1) ? kDistance_MaskStyle : kCoverage_MaskStyle;
-    }
-    
     static inline uint16_t UnpackID(PackedID packed) {
         return (uint16_t)packed;
     }