Remove fColor from PathRenderer DrawPathArgs struct

src/gpu/batches/GrMSAAPathRenderer.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrMSAAPathRenderer.h"
 
 #include "GrAuditTrail.h"
@@ skipping 542 matching lines @@
     int fMaxQuadIndices;
     bool fIsIndexed;
 
     typedef GrVertexBatch INHERITED;
 };
 
 bool GrMSAAPathRenderer::internalDrawPath(GrDrawContext* drawContext,
                                           const GrPaint& paint,
                                           const GrUserStencilSettings* userStencilSettings,
                                           const GrClip& clip,
-                                          GrColor color,
                                           const SkMatrix& viewMatrix,
                                           const GrShape& shape,
                                           bool stencilOnly) {
     SkASSERT(shape.style().isSimpleFill());
     SkPath path;
     shape.asPath(&path);
 
     int                          passCount = 0;
     const GrUserStencilSettings* passes[3];
     GrPipelineBuilder::DrawFace  drawFace[3];
@@ skipping 75 matching lines @@
                     if (!viewMatrix.invert(&localMatrix)) {
                         return false;
                     }
                 }
             } else {
                 bounds = path.getBounds();
             }
             const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? SkMatrix::I() :
                                                                                viewMatrix;
             SkAutoTUnref<GrDrawBatch> batch(
-                    GrRectBatchFactory::CreateNonAAFill(color, viewM, bounds, nullptr,
+                    GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM, bounds, nullptr,
                                                         &localMatrix));
 
             GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
             pipelineBuilder.setDrawFace(drawFace[p]);
             if (passes[p]) {
                 pipelineBuilder.setUserStencil(passes[p]);
             } else {
                 pipelineBuilder.setUserStencil(userStencilSettings);
             }
 
             drawContext->drawBatch(pipelineBuilder, clip, batch);
         } else {
-            SkAutoTUnref<MSAAPathBatch> batch(new MSAAPathBatch(color, path, viewMatrix,
+            SkAutoTUnref<MSAAPathBatch> batch(new MSAAPathBatch(paint.getColor(), path, viewMatrix,
                                                                 devBounds));
             if (!batch->isValid()) {
                 return false;
             }
 
             GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
             pipelineBuilder.setDrawFace(drawFace[p]);
             if (passes[p]) {
                 pipelineBuilder.setUserStencil(passes[p]);
             } else {
@@ skipping 23 matching lines @@
     const GrShape* shape = args.fShape;
     if (shape->style().applies()) {
         SkScalar styleScale = GrStyle::MatrixToScaleFactor(*args.fViewMatrix);
         tmpShape.init(args.fShape->applyStyle(GrStyle::Apply::kPathEffectAndStrokeRec, styleScale));
         shape = tmpShape.get();
     }
     return this->internalDrawPath(args.fDrawContext,
                                   *args.fPaint,
                                   args.fUserStencilSettings,
                                   *args.fClip,
-                                  args.fColor,
                                   *args.fViewMatrix,
                                   *shape,
                                   false);
 }
 
 void GrMSAAPathRenderer::onStencilPath(const StencilPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrMSAAPathRenderer::onStencilPath");
     SkASSERT(args.fShape->style().isSimpleFill());
     SkASSERT(!args.fShape->mayBeInverseFilledAfterStyling());
 
     GrPaint paint;
     paint.setXPFactory(GrDisableColorXPFactory::Make());
     paint.setAntiAlias(args.fIsAA);
 
     this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUnused, *args.fClip,
-                           GrColor_WHITE, *args.fViewMatrix, *args.fShape, true);
+                           *args.fViewMatrix, *args.fShape, true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////