Revert of Fix color emoji.

src/gpu/GrTextStrike.h

Index: src/gpu/GrTextStrike.h
diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h
index 779d676e433f2a50e3185898396db9c221c05ee6..401bd7325909aa39be8a2e0ee655e1a08cf3f3e9 100644
--- a/src/gpu/GrTextStrike.h
+++ b/src/gpu/GrTextStrike.h
@@ -23,16 +23,18 @@
 class GrFontPurgeListener;
 
 /**
- *  The textstrike maps a hostfontscaler instance to a dictionary of
+ *  The textcache maps a hostfontscaler instance to a dictionary of
  *  glyphid->strike
  */
 class GrTextStrike {
 public:
-    GrTextStrike(GrFontCache*, const GrFontDescKey* fontScalerKey);
+    GrTextStrike(GrFontCache*, const GrFontDescKey* fontScalerKey, GrMaskFormat, GrAtlas*);
     ~GrTextStrike();
 
     const GrFontDescKey* getFontScalerKey() const { return fFontScalerKey; }
     GrFontCache* getFontCache() const { return fFontCache; }
+    GrMaskFormat getMaskFormat() const { return fMaskFormat; }
+    GrTexture*   getTexture() const { return fAtlas->getTexture(); }
 
     inline GrGlyph* getGlyph(GrGlyph::PackedID, GrFontScaler*);
     // returns true if glyph (or glyph+padding for distance field)
@@ -65,6 +67,8 @@
     GrTAllocPool<GrGlyph> fPool;
 
     GrFontCache*    fFontCache;
+    GrAtlas*        fAtlas;
+    GrMaskFormat    fMaskFormat;
     bool            fUseDistanceField;
 
     GrAtlas::ClientPlotUsage fPlotUsage;
@@ -81,15 +85,10 @@
 
     inline GrTextStrike* getStrike(GrFontScaler*, bool useDistanceField);
 
-    // add to texture atlas that matches this format
-    GrPlot* addToAtlas(GrMaskFormat format, GrAtlas::ClientPlotUsage* usage,
-                       int width, int height, const void* image,
-                       SkIPoint16* loc);
-
     void freeAll();
 
-    // make an unused plot available for this glyph
-    bool freeUnusedPlot(GrTextStrike* preserveStrike, const GrGlyph* glyph);
+    // make an unused plot available
+    bool freeUnusedPlot(GrTextStrike* preserveStrike);
 
     // testing
     int countStrikes() const { return fCache.count(); }