Revert of Adding bulk plot reffer to cached textblobs

src/gpu/GrBatchFontCache.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchFontCache.h"
 #include "GrFontAtlasSizes.h"
 #include "GrGpu.h"
@@ skipping 110 matching lines @@
     int atlasIndex = MaskFormatToAtlasIndex(format);
     SkASSERT(fAtlases[atlasIndex]);
     return fAtlases[atlasIndex];
 }
 
 bool GrBatchFontCache::hasGlyph(GrGlyph* glyph) {
     SkASSERT(glyph);
     return this->getAtlas(glyph->fMaskFormat)->hasID(glyph->fID);
 }
 
-void GrBatchFontCache::addGlyphToBulkAndSetUseToken(GrBatchAtlas::BulkUseTokenUpdater* updater,
-                                                    GrGlyph* glyph,
-                                                    GrBatchAtlas::BatchToken token) {
+void GrBatchFontCache::setGlyphRefToken(GrGlyph* glyph, GrBatchAtlas::BatchToken batchToken) {
     SkASSERT(glyph);
-    updater->add(glyph->fID);
-    this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token);
-}
-
-void GrBatchFontCache::setUseTokenBulk(const GrBatchAtlas::BulkUseTokenUpdater& updater,
-                                       GrBatchAtlas::BatchToken token,
-                                       GrMaskFormat format) {
-    this->getAtlas(format)->setLastUseTokenBulk(updater, token);
+    SkASSERT(this->getAtlas(glyph->fMaskFormat)->hasID(glyph->fID));
+    this->getAtlas(glyph->fMaskFormat)->setLastRefToken(glyph->fID, batchToken);
 }
 
 bool GrBatchFontCache::addToAtlas(GrBatchTextStrike* strike, GrBatchAtlas::AtlasID* id,
                                   GrBatchTarget* batchTarget,
                                   GrMaskFormat format, int width, int height, const void* image,
                                   SkIPoint16* loc) {
     fPreserveStrike = strike;
     return this->getAtlas(format)->addToAtlas(id, batchTarget, width, height, image, loc);
 }
 
@@ skipping 160 matching lines @@
     }
 
     bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, glyph->fMaskFormat,
                                                glyph->width(), glyph->height(),
                                                storage.get(), &glyph->fAtlasLocation);
     if (success) {
         fAtlasedGlyphs++;
     }
     return success;
 }