Fix for blinking/corrupted text in Canvas 2D.

src/gpu/GrTextStrike.cpp

Index: src/gpu/GrTextStrike.cpp
diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index 4a56051264722d90335ce309414ece604f182073..ab7d8f06a668039fe1a1016674417d79d9237c42 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -259,8 +259,7 @@ bool GrTextStrike::removeUnusedPlots() {
     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;
@@ -269,10 +268,7 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler,
     SkASSERT(glyph);
     SkASSERT(scaler);
     SkASSERT(fCache.contains(glyph));
-    if (glyph->fPlot) {
-        glyph->fPlot->setDrawToken(currentDrawToken);
-        return true;
-    }
+    SkASSERT(NULL == glyph->fPlot);
 
     SkAutoRef ar(scaler);
 
@@ -294,6 +290,5 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler,
     }
 
     glyph->fPlot = plot;
-    plot->setDrawToken(currentDrawToken);
     return true;
 }