Revert of Fix color emoji.

include/gpu/GrFontScaler.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 GrFontScaler_DEFINED
 #define GrFontScaler_DEFINED
 
@@ skipping 48 matching lines @@
  *  for a specific font+size+matrix.
  */
 class GrFontScaler : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrFontScaler)
 
     explicit GrFontScaler(SkGlyphCache* strike);
     virtual ~GrFontScaler();
     
     const GrFontDescKey* getKey();
-    GrMaskFormat getMaskFormat() const;
-    GrMaskFormat getPackedGlyphMaskFormat(GrGlyph::PackedID) const;
+    GrMaskFormat getMaskFormat();
     bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds);
     bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,
                                      int rowBytes, void* image);
     bool getPackedGlyphDFBounds(GrGlyph::PackedID, SkIRect* bounds);
     bool getPackedGlyphDFImage(GrGlyph::PackedID, int width, int height,
                                        void* image);
     bool getGlyphPath(uint16_t glyphID, SkPath*);
     
 private:
     SkGlyphCache*  fStrike;
     GrFontDescKey* fKey;
     
     typedef SkRefCnt INHERITED;
 };
 
 #endif