Revert of Fix color emoji.

src/gpu/GrBitmapTextContext.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBitmapTextContext_DEFINED
 #define GrBitmapTextContext_DEFINED
 
@@ skipping 22 matching lines @@
 private:
     enum {
         kMinRequestedGlyphs      = 1,
         kDefaultRequestedGlyphs  = 64,
         kMinRequestedVerts       = kMinRequestedGlyphs * 4,
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
     GrTextStrike*                     fStrike;
     void*                             fVertices;
-    int                               fCurrVertex;
-    int                               fMaxVertices;
-    SkRect                            fVertexBounds;
+    int32_t                           fMaxVertices;
     GrTexture*                        fCurrTexture;
-    GrMaskFormat                      fCurrMaskFormat;
     SkAutoTUnref<GrGeometryProcessor> fCachedGeometryProcessor;
     // Used to check whether fCachedEffect is still valid.
     uint32_t                          fEffectTextureUniqueID;
+    int                               fCurrVertex;
+    SkRect                            fVertexBounds;
 
     void init(const GrPaint&, const SkPaint&);
     void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
     void flush();                 // automatically called by destructor
     void finish();
 
 };
 
 #endif