Fix silly mistake in allocating geoms in TextBatch

src/gpu/GrAtlasTextContext.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 "GrAtlasTextContext.h"
 
 #include "GrBatch.h"
 #include "GrBatchFontCache.h"
@@ skipping 1910 matching lines @@
         }
 
         fBatch.fNumGlyphs += that->numGlyphs();
 
         // Reallocate space for geo data if necessary and then import that's geo data.
         int newGeoCount = that->fGeoCount + fGeoCount;
         // We assume (and here enforce) that the allocation size is the smallest power of two that
         // is greater than or equal to the number of geometries (and at least
         // kMinGeometryAllocated).
         int newAllocSize = GrNextPow2(newGeoCount);
         int currAllocSize = SkTMax<int>(kMinGeometryAllocated, GrNextPow2(fGeoCount));

[joshualitt, 2015/07/29 13:45:10]

Actually, I'm not sure I like the use of 'size' here.  Size makes me think
bytes.

 
-        if (newAllocSize > currAllocSize) {
+        if (newGeoCount > currAllocSize) {
             fGeoData.realloc(newAllocSize);
         }
 
         memcpy(&fGeoData[fGeoCount], that->fGeoData.get(), that->fGeoCount * sizeof(Geometry));
         // We steal the ref on the blobs from the other TextBatch and set its count to 0 so that
         // it doesn't try to unref them.
 #ifdef SK_DEBUG
         for (int i = 0; i < that->fGeoCount; ++i) {
             that->fGeoData.get()[i].fBlob = (Blob*)0x1;
         }
@@ skipping 328 matching lines @@
             gTextContext->createDrawTextBlob(rt, clip, grPaint, skPaint, viewMatrix, text,
                                              static_cast<size_t>(textLen), 0, 0, noClip));
 
     SkScalar transX = static_cast<SkScalar>(random->nextU());
     SkScalar transY = static_cast<SkScalar>(random->nextU());
     const GrAtlasTextBlob::Run::SubRunInfo& info = blob->fRuns[0].fSubRunInfo[0];
     return gTextContext->createBatch(blob, info, textLen, 0, 0, color, transX, transY, skPaint);
 }
 
 #endif