A small text cleanup

src/gpu/GrAtlasTextBlob.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 "GrAtlasTextBlob.h"
 
-void GrAtlasTextBlob::appendGlyph(Run* run,
-                                  Run::SubRunInfo* subRun,
-                                  const SkRect& positions, GrColor color,
-                                  size_t vertexStride, bool useVertexColor,
+void GrAtlasTextBlob::appendGlyph(int runIndex,
+                                  const SkRect& positions,
+                                  GrColor color,
+                                  GrBatchTextStrike* strike,
                                   GrGlyph* glyph) {
-    run->fVertexBounds.joinNonEmptyArg(positions);
-    run->fColor = color;
+    Run& run = fRuns[runIndex];
+    GrMaskFormat format = glyph->fMaskFormat;
+
+    Run::SubRunInfo* subRun = &run.fSubRunInfo.back();
+    if (run.fInitialized && subRun->maskFormat() != format) {
+        subRun = &run.push_back();
+        subRun->setStrike(strike);
+    } else if (!run.fInitialized) {
+        subRun->setStrike(strike);
+    }
+
+    run.fInitialized = true;
+
+    size_t vertexStride = GetVertexStride(format);
+
+    subRun->setMaskFormat(format);
+
+    run.fVertexBounds.joinNonEmptyArg(positions);
+    run.fColor = color;
 
     intptr_t vertex = reinterpret_cast<intptr_t>(this->fVertices + subRun->vertexEndIndex());
 
-    if (useVertexColor) {
+    if (kARGB_GrMaskFormat != glyph->fMaskFormat) {
         // V0
         SkPoint* position = reinterpret_cast<SkPoint*>(vertex);
         position->set(positions.fLeft, positions.fTop);
         SkColor* colorPtr = reinterpret_cast<SkColor*>(vertex + sizeof(SkPoint));
         *colorPtr = color;
         vertex += vertexStride;
 
         // V1
         position = reinterpret_cast<SkPoint*>(vertex);
         position->set(positions.fLeft, positions.fBottom);
@@ skipping 132 matching lines @@
                      rSubRun.fBulkUseToken.fPlotAlreadyUpdated);
             for (int k = 0; k < lSubRun.fBulkUseToken.fPlotsToUpdate.count(); k++) {
                 SkASSERT(lSubRun.fBulkUseToken.fPlotsToUpdate[k] ==
                          rSubRun.fBulkUseToken.fPlotsToUpdate[k]);
             }*/
         }
     }
 }
 
 #endif