Even more hiding of Geometry structs in GrBatch subclasses.

src/gpu/batches/GrDrawAtlasBatch.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 "GrDrawAtlasBatch.h"
 #include "GrBatchFlushState.h"
 #include "GrBatchTest.h"
@@ skipping 64 matching lines @@
     for (int i = 0; i < instanceCount; i++) {
         const Geometry& args = fGeoData[i];
 
         size_t allocSize = args.fVerts.count();
         memcpy(vertPtr, args.fVerts.begin(), allocSize);
         vertPtr += allocSize;
     }
     helper.recordDraw(target, gp.get());
 }
 
-GrDrawAtlasBatch::GrDrawAtlasBatch(const Geometry& geometry, const SkMatrix& viewMatrix,
-                                   int spriteCount, const SkRSXform* xforms, const SkRect* rects,
+GrDrawAtlasBatch::GrDrawAtlasBatch(GrColor color, const SkMatrix& viewMatrix, int spriteCount,
+                                   const SkRSXform* xforms, const SkRect* rects,
                                    const SkColor* colors)
-    : INHERITED(ClassID()) {
+        : INHERITED(ClassID()) {
     SkASSERT(xforms);
     SkASSERT(rects);
 
     fViewMatrix = viewMatrix;
-    Geometry& installedGeo = fGeoData.push_back(geometry);
+    Geometry& installedGeo = fGeoData.push_back();
+    installedGeo.fColor = color;
 
     // Figure out stride and offsets
     // Order within the vertex is: position [color] texCoord
     size_t texOffset = sizeof(SkPoint);
     size_t vertexStride = 2*sizeof(SkPoint);
     fHasColors = SkToBool(colors);
     if (colors) {
         texOffset += sizeof(GrColor);
         vertexStride += sizeof(GrColor);
     }
@@ skipping 77 matching lines @@
         return false;
     }
 
     if (!this->hasColors() && this->color() != that->color()) {
         return false;
     }
 
     if (this->color() != that->color()) {
         fColor = GrColor_ILLEGAL;
     }
-    fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+    fGeoData.push_back_n(that->fGeoData.count(), that->fGeoData.begin());
     fQuadCount += that->quadCount();
 
     this->joinBounds(that->bounds());
     return true;
 }
 
 #ifdef GR_TEST_UTILS
 
 static SkRSXform random_xform(SkRandom* random) {
     static const SkScalar kMinExtent = -100.f;
@@ skipping 47 matching lines @@
     bool hasColors = random->nextBool();
 
     randomize_params(spriteCount,
                      random,
                      &xforms,
                      &texRects,
                      &colors, hasColors);
 
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
 
-    GrDrawAtlasBatch::Geometry geometry;
-    geometry.fColor = GrRandomColor(random);
-    return GrDrawAtlasBatch::Create(geometry, viewMatrix, spriteCount, xforms.begin(),
-                                    texRects.begin(), hasColors ? colors.begin() : nullptr);
+    GrColor color = GrRandomColor(random);
+    return new GrDrawAtlasBatch(color, viewMatrix, spriteCount, xforms.begin(), texRects.begin(),
+                                hasColors ? colors.begin() : nullptr);
 }
 
 #endif