Revert of Separate user and raw stencil settings

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 907fc1fa4f1cfdd55eac722a83f23ff0c1073dc6..c863b455b36ed8ae630424daf503c179cdb8d6b1 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -223,7 +223,6 @@
     void forwardCombine();
     bool installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
                                     const GrScissorState* scissor,
-                                    bool hasStencilClip,
                                     GrDrawBatch* batch);
 
     // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
@@ -234,6 +233,11 @@
         GrXferProcessor::DstTexture*,
         const SkRect& batchBounds);
 
+    // Check to see if this set of draw commands has been sent out
+    void getPathStencilSettingsForFilltype(GrPathRendering::FillType,
+                                           const GrStencilAttachment*,
+                                           GrStencilSettings*);
+
     void addDependency(GrDrawTarget* dependedOn);
 
     // Used only by CMM.