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

src/gpu/GrGlyph.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGlyph_DEFINED
 #define GrGlyph_DEFINED
 
 #include "GrRect.h"
 #include "GrTypes.h"
 
 #include "SkChecksum.h"
 #include "SkPath.h"
 
 class GrPlot;
 
 /*  Need this to be quad-state:
     - complete w/ image
     - just metrics
     - failed to get image, but has metrics
     - failed to get metrics
  */
 struct GrGlyph {
-    enum MaskStyle {
-        kCoverage_MaskStyle,
-        kDistance_MaskStyle
-    };
-    
     typedef uint32_t PackedID;
 
     GrPlot*      fPlot;
     SkPath*      fPath;
     PackedID     fPackedID;
     GrMaskFormat fMaskFormat;
     GrIRect16    fBounds;
     SkIPoint16   fAtlasLocation;
 
     void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
@@ skipping 17 matching lines @@
     bool isEmpty() const { return fBounds.isEmpty(); }
     uint16_t glyphID() const { return UnpackID(fPackedID); }
 
     ///////////////////////////////////////////////////////////////////////////
 
     static inline unsigned ExtractSubPixelBitsFromFixed(SkFixed pos) {
         // two most significant fraction bits from fixed-point
         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) {
         return ((packed >> 18) & 3) << 14;
     }
 
     static inline SkFixed UnpackFixedY(PackedID packed) {
         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;
     }
 
     static inline const GrGlyph::PackedID& GetKey(const GrGlyph& glyph) {
         return glyph.fPackedID;
     }
 
     static inline uint32_t Hash(GrGlyph::PackedID key) {
         return SkChecksum::Murmur3(&key, sizeof(key));
     }
 };
 
 #endif