Separate user and raw stencil settings

src/gpu/batches/GrMSAAPathRenderer.cpp

Index: src/gpu/batches/GrMSAAPathRenderer.cpp
diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp
index a9ba06c5f4ad056b5b3d0f770fe21ff5e427a9ca..47b0efffd13ac01062fb731117d9923db388b6f0 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.cpp
+++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
@@ -580,11 +580,11 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target,
     // face culling doesn't make sense here
     SkASSERT(GrPipelineBuilder::kBoth_DrawFace == pipelineBuilder->getDrawFace());
 
-    int                         passCount = 0;
-    const GrStencilSettings*    passes[3];
-    GrPipelineBuilder::DrawFace drawFace[3];
-    bool                        reverse = false;
-    bool                        lastPassIsBounds;
+    int                          passCount = 0;
+    const GrUserStencilSettings* passes[3];
+    GrPipelineBuilder::DrawFace  drawFace[3];
+    bool                         reverse = false;
+    bool                         lastPassIsBounds;
 
     if (single_pass_path(path, *stroke)) {
         passCount = 1;
@@ -649,7 +649,7 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target,
     for (int p = 0; p < passCount; ++p) {
         pipelineBuilder->setDrawFace(drawFace[p]);
         if (passes[p]) {
-            *pipelineBuilder->stencil() = *passes[p];
+            pipelineBuilder->setUserStencil(passes[p]);
         }
 
         if (lastPassIsBounds && (p == passCount-1)) {