Separate user and raw stencil settings

src/gpu/batches/GrDrawPathBatch.h

Index: src/gpu/batches/GrDrawPathBatch.h
diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h
index d29d046de3c9607b452a736dac3d74eb8a79897c..55fe31a6bd42421dec33be2b01dda363c5d509ce 100644
--- a/src/gpu/batches/GrDrawPathBatch.h
+++ b/src/gpu/batches/GrDrawPathBatch.h
@@ -28,7 +28,10 @@ public:
 
     GrPathRendering::FillType fillType() const { return fFillType; }
 
-    void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
+    void setStencilSettings(const GrUserStencilSettings& stencil, bool hasStencilClip,
+                            int numStencilBits) {
+        fStencilSettings.reset(stencil, hasStencilClip, numStencilBits);
+    }
 
 protected:
     GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor,