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 6e0076c11f703c94a4fa2cd464ba2770b180fbec..8b1319b68208ef5f008d9dd2d700ed0481b1be3a 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.cpp
+++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
@@ -578,11 +578,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)) {
         passCount = 1;
@@ -647,7 +647,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)) {