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 a379144a4289067c572ded56d9462ecff5d01abd..0e534d694afe1fb7c1ef2b518d83938c4910a0bf 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -9,8 +9,10 @@
 #define GrGlyph_DEFINED
 
 #include "GrRect.h"
-#include "SkPath.h"
+#include "GrTypes.h"
+
 #include "SkChecksum.h"
+#include "SkPath.h"
 
 class GrPlot;
 
@@ -23,17 +25,19 @@ class GrPlot;
 struct GrGlyph {
     typedef uint32_t PackedID;
 
-    GrPlot*     fPlot;
-    SkPath*     fPath;
-    PackedID    fPackedID;
-    GrIRect16   fBounds;
-    SkIPoint16  fAtlasLocation;
+    GrPlot*      fPlot;
+    SkPath*      fPath;
+    PackedID     fPackedID;
+    GrMaskFormat fMaskFormat;

[reed1, 2014/10/10 14:24:25]

note for the future : can we pack mask-format somewhere into PackedID, so we
don't have to grow the size of this struct?

[jvanverth1, 2014/10/10 15:10:15]

PackedID is effectively 20 bits (16 bit glyph id + subpixel x and y), so this
should be possible.

+    GrIRect16    fBounds;
+    SkIPoint16   fAtlasLocation;
 
-    void init(GrGlyph::PackedID packed, const SkIRect& bounds) {
+    void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
         fPlot = NULL;
         fPath = NULL;
         fPackedID = packed;
         fBounds.set(bounds);
+        fMaskFormat = format;
         fAtlasLocation.set(0, 0);
     }