Revert of Adding bulk plot reffer to cached textblobs

src/gpu/GrBatchFontCache.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBatchFontCache_DEFINED
 #define GrBatchFontCache_DEFINED
 
@@ skipping 79 matching lines @@
         GrBatchTextStrike* strike = fCache.find(*(scaler->getKey()));
         if (NULL == strike) {
             strike = this->generateStrike(scaler);
         }
         return strike;
     }
 
     bool hasGlyph(GrGlyph* glyph);
 
     // To ensure the GrBatchAtlas does not evict the Glyph Mask from its texture backing store,
-    // the client must pass in the currentToken from the GrBatchTarget along with the GrGlyph.
-    // A BulkUseTokenUpdater is used to manage bulk last use token updating in the Atlas.
-    // For convenience, this function will also set the use token for the current glyph if required
-    // NOTE: the bulk uploader is only valid if the subrun has a valid atlasGeneration
-    void addGlyphToBulkAndSetUseToken(GrBatchAtlas::BulkUseTokenUpdater*, GrGlyph*,
-                                      GrBatchAtlas::BatchToken);
-
-    void setUseTokenBulk(const GrBatchAtlas::BulkUseTokenUpdater&, GrBatchAtlas::BatchToken,
-                         GrMaskFormat);
+    // the client must pass in the currentToken from the GrBatchTarget along with the GrGlyph
+    void setGlyphRefToken(GrGlyph*, GrBatchAtlas::BatchToken);
 
     // add to texture atlas that matches this format
     bool addToAtlas(GrBatchTextStrike*, GrBatchAtlas::AtlasID*, GrBatchTarget*,
                     GrMaskFormat, int width, int height, const void* image,
                     SkIPoint16* loc);
 
     // Some clients may wish to verify the integrity of the texture backing store of the
     // GrBatchAtlas.  The atlasGeneration returned below is a monitonically increasing number which
     // changes everytime something is removed from the texture backing store.
     uint64_t atlasGeneration(GrMaskFormat) const;
@@ skipping 16 matching lines @@
 
     static void HandleEviction(GrBatchAtlas::AtlasID, void*);
 
     SkTDynamicHash<GrBatchTextStrike, GrFontDescKey> fCache;
 
     GrBatchAtlas* fAtlases[kMaskFormatCount];
     GrBatchTextStrike* fPreserveStrike;
 };
 
 #endif