Revert of Fix color emoji.

include/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 "SkPath.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 {
     typedef uint32_t PackedID;
 
-    GrPlot*      fPlot;
-    SkPath*      fPath;
-    PackedID     fPackedID;
-    GrMaskFormat fMaskFormat;
-    GrIRect16    fBounds;
-    SkIPoint16   fAtlasLocation;
+    GrPlot*     fPlot;
+    SkPath*     fPath;
+    PackedID    fPackedID;
+    GrIRect16   fBounds;
+    SkIPoint16  fAtlasLocation;
 
-    void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
+    void init(GrGlyph::PackedID packed, const SkIRect& bounds) {
         fPlot = NULL;
         fPath = NULL;
         fPackedID = packed;
         fBounds.set(bounds);
-        fMaskFormat = format;
         fAtlasLocation.set(0, 0);
     }
 
     void free() {
         if (fPath) {
             delete fPath;
             fPath = NULL;
         }
     }
 
@@ skipping 30 matching lines @@
     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