commit 5c3ea4cd3921e8904d4f201bcdedfd5b8a726542
author robertphillips <robertphillips@google.com> Mon Oct 26 08:33:10 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 26 08:33:10 2015 -0700
tree 6dd7ca7a1cf6ff120496d6fe6b26f6c8db0a7682
parent 950305ec77702639fe6ad1923f7b8d828ccef634

Fix ClipMaskManager's SW-fallback logic

'useSWOnlyPath' was not correctly toggling between stencil and color draws so there was a mismatch with the behavior in createAlphaClipMask (i.e., we were inadvertently rendering some of the elements in a clip using SW but using stenciling for others - precisely what 'useSWOnlyPath' was intended to prevent).

Review URL: https://codereview.chromium.org/1421533007

src/gpu/GrPathRendererChain.cpp

diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index b1eb320..c846dee 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -40,7 +40,7 @@
 }
 
 GrPathRenderer* GrPathRendererChain::getPathRenderer(const GrShaderCaps* shaderCaps,
-                                                     const GrPipelineBuilder* pipelineBuilder,
+                                                     const GrPipelineBuilder& pipelineBuilder,
                                                      const SkMatrix& viewMatrix,
                                                      const SkPath& path,
                                                      const GrStrokeInfo& stroke,
@@ -66,15 +66,15 @@
         minStencilSupport = GrPathRenderer::kNoSupport_StencilSupport;
     }
 
+    GrPathRenderer::CanDrawPathArgs args;
+    args.fShaderCaps = shaderCaps;
+    args.fPipelineBuilder = &pipelineBuilder;
+    args.fViewMatrix = &viewMatrix;
+    args.fPath = &path;
+    args.fStroke = &stroke;
+    args.fAntiAlias = antiAlias;
 
     for (int i = 0; i < fChain.count(); ++i) {
-        GrPathRenderer::CanDrawPathArgs args;
-        args.fShaderCaps = shaderCaps;
-        args.fPipelineBuilder = pipelineBuilder;
-        args.fViewMatrix = &viewMatrix;
-        args.fPath = &path;
-        args.fStroke = &stroke;
-        args.fAntiAlias = antiAlias;
         if (fChain[i]->canDrawPath(args)) {
             if (GrPathRenderer::kNoSupport_StencilSupport != minStencilSupport) {
                 GrPathRenderer::StencilSupport support =