commit d2b6d6486ed9d00df779f6b337d756c9a818006f
author robertphillips <robertphillips@google.com> Thu Jul 21 08:55:08 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 21 08:55:08 2016 -0700
tree 42dec09e869f89f94a3085844942e403bc0f34f4
parent 7b33bf1d2a8664235a9eb372024641d2da1a0dad

Minor change to Ganesh path renderers

In large part this is an attempt to get non-substantive changes out of https://codereview.chromium.org/2092893003/ (Retract PipelineBuilder some more)

All the other parameters extracted from DrawPathArgs are passed around by reference except for the userStencilSettings

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2167183002

Review-Url: https://codereview.chromium.org/2167183002

src/gpu/batches/GrMSAAPathRenderer.cpp

diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp
index 39b924c..ec54f32 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.cpp
+++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
@@ -558,7 +558,7 @@
 
 bool GrMSAAPathRenderer::internalDrawPath(GrDrawContext* drawContext,
                                           const GrPaint& paint,
-                                          const GrUserStencilSettings* userStencilSettings,
+                                          const GrUserStencilSettings& userStencilSettings,
                                           const GrClip& clip,
                                           const SkMatrix& viewMatrix,
                                           const GrShape& shape,
@@ -579,7 +579,7 @@
         if (stencilOnly) {
             passes[0] = &gDirectToStencil;
         } else {
-            passes[0] = userStencilSettings;
+            passes[0] = &userStencilSettings;
         }
         lastPassIsBounds = false;
     } else {
@@ -699,7 +699,7 @@
     }
     return this->internalDrawPath(args.fDrawContext,
                                   *args.fPaint,
-                                  args.fUserStencilSettings,
+                                  *args.fUserStencilSettings,
                                   *args.fClip,
                                   *args.fViewMatrix,
                                   *shape,
@@ -716,7 +716,7 @@
     paint.setXPFactory(GrDisableColorXPFactory::Make());
     paint.setAntiAlias(args.fIsAA);
 
-    this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUnused, *args.fClip,
+    this->internalDrawPath(args.fDrawContext, paint, GrUserStencilSettings::kUnused, *args.fClip,
                            *args.fViewMatrix, *args.fShape, true);
 }