Fix for blinking/corrupted text in Canvas 2D.

src/gpu/GrTextStrike.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
@@ skipping 241 matching lines @@
     glyph->init(packed, bounds);
     fCache.insert(packed, glyph);
     return glyph;
 }
 
 bool GrTextStrike::removeUnusedPlots() {
     fCache.getArray().visitAll(invalidate_glyph);
     return fAtlasMgr->removeUnusedPlots(&fAtlas);
 }
 
-bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler,
-                                 GrDrawTarget::DrawToken currentDrawToken) {
+bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
 #if 0   // testing hack to force us to flush our cache often
     static int gCounter;
     if ((++gCounter % 10) == 0) return false;
 #endif
 
     SkASSERT(glyph);
     SkASSERT(scaler);
     SkASSERT(fCache.contains(glyph));
-    if (glyph->fPlot) {
-        glyph->fPlot->setDrawToken(currentDrawToken);
-        return true;
-    }
+    SkASSERT(NULL == glyph->fPlot);
 
     SkAutoRef ar(scaler);
 
     int bytesPerPixel = GrMaskFormatBytesPerPixel(fMaskFormat);
     size_t size = glyph->fBounds.area() * bytesPerPixel;
     SkAutoSMalloc<1024> storage(size);
     if (!scaler->getPackedGlyphImage(glyph->fPackedID, glyph->width(),
                                      glyph->height(),
                                      glyph->width() * bytesPerPixel,
                                      storage.get())) {
         return false;
     }
 
     GrPlot* plot = fAtlasMgr->addToAtlas(&fAtlas, glyph->width(),
                                          glyph->height(), storage.get(),
                                          &glyph->fAtlasLocation);
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
-    plot->setDrawToken(currentDrawToken);
     return true;
 }