Clean up some lint complaints and fix center_of_mass()

src/gpu/batches/GrAAHairLinePathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAHairLinePathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 890 matching lines @@
         int vertexCount = kQuadNumVertices * quadCount + kQuadNumVertices * conicCount;
         void *vertices = target->makeVertexSpace(vertexStride, vertexCount,
                                                  &vertexBuffer, &firstVertex);
 
         if (!vertices || !quadsIndexBuffer) {
             SkDebugf("Could not allocate vertices\n");
             return;
         }
 
         // Setup vertices
-        BezierVertex* verts = reinterpret_cast<BezierVertex*>(vertices);
+        BezierVertex* bezVerts = reinterpret_cast<BezierVertex*>(vertices);
 
         int unsubdivQuadCnt = quads.count() / 3;
         for (int i = 0; i < unsubdivQuadCnt; ++i) {
             SkASSERT(qSubdivs[i] >= 0);
-            add_quads(&quads[3*i], qSubdivs[i], toDevice, toSrc, &verts);
+            add_quads(&quads[3*i], qSubdivs[i], toDevice, toSrc, &bezVerts);
         }
 
         // Start Conics
         for (int i = 0; i < conicCount; ++i) {
-            add_conics(&conics[3*i], cWeights[i], toDevice, toSrc, &verts);
+            add_conics(&conics[3*i], cWeights[i], toDevice, toSrc, &bezVerts);
         }
 
         if (quadCount > 0) {
             target->initDraw(quadGP, this->pipeline());
 
             {
-                GrVertices verts;
-                verts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
-                                    firstVertex, kQuadNumVertices, kIdxsPerQuad, quadCount,
-                                    kQuadsNumInIdxBuffer);
-                target->draw(verts);
+                GrVertices tempVerts;
+                tempVerts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                        firstVertex, kQuadNumVertices, kIdxsPerQuad, quadCount,
+                                        kQuadsNumInIdxBuffer);
+                target->draw(tempVerts);
                 firstVertex += quadCount * kQuadNumVertices;
            }
         }
 
         if (conicCount > 0) {
             target->initDraw(conicGP, this->pipeline());
 
             {
-                GrVertices verts;
-                verts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
-                                    firstVertex, kQuadNumVertices, kIdxsPerQuad, conicCount,
-                                    kQuadsNumInIdxBuffer);
-                target->draw(verts);
+                GrVertices tempVerts;
+                tempVerts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                        firstVertex, kQuadNumVertices, kIdxsPerQuad, conicCount,
+                                        kQuadsNumInIdxBuffer);
+                target->draw(tempVerts);
             }
         }
     }
 }
 
 static GrDrawBatch* create_hairline_batch(GrColor color,
                                           const SkMatrix& viewMatrix,
                                           const SkPath& path,
                                           const GrStrokeInfo& stroke,
                                           const SkIRect& devClipBounds) {
@@ skipping 33 matching lines @@
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
     SkPath path = GrTest::TestPath(random);
     SkIRect devClipBounds;
     devClipBounds.setEmpty();
     return create_hairline_batch(color, viewMatrix, path, stroke, devClipBounds);
 }
 
 #endif