Fix bug with GrAtlasTextContext color regen

src/gpu/batches/GrAtlasTextBatch.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 "GrAtlasTextBatch.h"
 
 #include "GrBatchFontCache.h"
@@ skipping 185 matching lines @@
 
         intptr_t vertex = reinterpret_cast<intptr_t>(blob->fVertices);
         vertex += info->vertexStartIndex();
         vertex += vertexStride * glyphIdx * GrAtlasTextBatch::kVerticesPerGlyph;
         regen_vertices<regenPos, regenCol, regenTexCoords>(vertex, glyph, vertexStride,
                                                            this->usesDistanceFields(), transX,
                                                            transY, color);
         flushInfo->fGlyphsToFlush++;
     }
 
-    // We my have changed the color so update it here
-    run->fColor = color;
+    // We may have changed the color so update it here
+    info->setColor(color);
     if (regenTexCoords) {
         if (regenGlyphs) {
             info->setStrike(strike);
         }
         info->setAtlasGeneration(brokenRun ? GrBatchAtlas::kInvalidAtlasGeneration :
                                              fFontCache->atlasGeneration(this->maskFormat()));
     }
 }
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 153 matching lines @@
         // been abandoned.  If it hasn't been abandoned, then we can use the GrGlyph*s as is
         // otherwise we have to get the new strike, and use that to get the correct glyphs.
         // Because we do not have the packed ids, and thus can't look up our glyphs in the
         // new strike, we instead keep our ref to the old strike and use the packed ids from
         // it.  These ids will still be valid as long as we hold the ref.  When we are done
         // updating our cache of the GrGlyph*s, we drop our ref on the old strike
         bool regenerateGlyphs = info.strike()->isAbandoned();
         bool regenerateTextureCoords = info.atlasGeneration() != currentAtlasGen ||
                                        regenerateGlyphs;
         bool regenerateColors = kARGB_GrMaskFormat != maskFormat &&
-                                run.fColor != args.fColor;
+                                info.color() != args.fColor;
         bool regeneratePositions = args.fTransX != 0.f || args.fTransY != 0.f;
         int glyphCount = info.glyphCount();
 
         uint32_t regenMaskBits = kNoRegen;
         regenMaskBits |= regeneratePositions ? kRegenPos : 0;
         regenMaskBits |= regenerateColors ? kRegenCol : 0;
         regenMaskBits |= regenerateTextureCoords ? kRegenTex : 0;
         regenMaskBits |= regenerateGlyphs ? kRegenGlyph : 0;
         RegenMask regenMask = (RegenMask)regenMaskBits;
 
@@ skipping 161 matching lines @@
         return GrDistanceFieldA8TextGeoProc::Create(color,
                                                     viewMatrix,
                                                     texture,
                                                     params,
                                                     flags,
                                                     this->usesLocalCoords());
 #endif
     }
 
 }