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/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 54d4851..87b0926 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -63,7 +63,7 @@
 
 void GrSoftwarePathRenderer::DrawNonAARect(GrDrawContext* drawContext,
                                            const GrPaint& paint,
-                                           const GrUserStencilSettings* userStencilSettings,
+                                           const GrUserStencilSettings& userStencilSettings,
                                            const GrClip& clip,
                                            const SkMatrix& viewMatrix,
                                            const SkRect& rect,
@@ -73,14 +73,14 @@
                                                                         nullptr, &localMatrix));
 
     GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
-    pipelineBuilder.setUserStencil(userStencilSettings);
+    pipelineBuilder.setUserStencil(&userStencilSettings);
 
     drawContext->drawBatch(pipelineBuilder, clip, batch);
 }
 
 void GrSoftwarePathRenderer::DrawAroundInvPath(GrDrawContext* drawContext,
                                                const GrPaint& paint,
-                                               const GrUserStencilSettings* userStencilSettings,
+                                               const GrUserStencilSettings& userStencilSettings,
                                                const GrClip& clip,
                                                const SkMatrix& viewMatrix,
                                                const SkIRect& devClipBounds,
@@ -137,7 +137,7 @@
                                    *args.fClip, *args.fShape,
                                    *args.fViewMatrix, &devShapeBounds, &devClipBounds)) {
         if (inverseFilled) {
-            DrawAroundInvPath(args.fDrawContext, *args.fPaint, args.fUserStencilSettings,
+            DrawAroundInvPath(args.fDrawContext, *args.fPaint, *args.fUserStencilSettings,
                               *args.fClip,
                               *args.fViewMatrix, devClipBounds, devShapeBounds);
 
@@ -148,17 +148,17 @@
     SkAutoTUnref<GrTexture> texture(
             GrSWMaskHelper::DrawShapeMaskToTexture(fTexProvider, *args.fShape, devShapeBounds,
                                                    args.fAntiAlias, args.fViewMatrix));
-    if (nullptr == texture) {
+    if (!texture) {
         return false;
     }
 
     GrSWMaskHelper::DrawToTargetWithShapeMask(texture, args.fDrawContext, *args.fPaint,
-                                              args.fUserStencilSettings,
+                                              *args.fUserStencilSettings,
                                               *args.fClip, *args.fViewMatrix,
                                               devShapeBounds);
 
     if (inverseFilled) {
-        DrawAroundInvPath(args.fDrawContext, *args.fPaint, args.fUserStencilSettings,
+        DrawAroundInvPath(args.fDrawContext, *args.fPaint, *args.fUserStencilSettings,
                           *args.fClip,
                           *args.fViewMatrix, devClipBounds, devShapeBounds);
     }