Revert of Fix color emoji.

include/gpu/GrGlyph.h

Index: include/gpu/GrGlyph.h
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h
index 0e534d694afe1fb7c1ef2b518d83938c4910a0bf..a379144a4289067c572ded56d9462ecff5d01abd 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -9,10 +9,8 @@
 #define GrGlyph_DEFINED
 
 #include "GrRect.h"
-#include "GrTypes.h"
-
+#include "SkPath.h"
 #include "SkChecksum.h"
-#include "SkPath.h"
 
 class GrPlot;
 
@@ -25,19 +23,17 @@
 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);
     }