Revert of Separate user and raw stencil settings

src/gpu/GrPipeline.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPipeline_DEFINED
 #define GrPipeline_DEFINED
 
 #include "GrColor.h"
 #include "GrFragmentProcessor.h"
 #include "GrGpu.h"
 #include "GrNonAtomicRef.h"
 #include "GrPendingProgramElement.h"
 #include "GrPrimitiveProcessor.h"
 #include "GrProgramDesc.h"
-#include "GrStencilSettings.h"
+#include "GrStencil.h"
 #include "GrTypesPriv.h"
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 
 class GrBatch;
 class GrDeviceCoordTexture;
 class GrPipelineBuilder;
 
 struct GrBatchToXPOverrides {
     GrBatchToXPOverrides()
@@ skipping 15 matching lines @@
 class GrPipeline : public GrNonAtomicRef<GrPipeline> {
 public:
     ///////////////////////////////////////////////////////////////////////////
     /// @name Creation
 
     struct CreateArgs {
         const GrPipelineBuilder*    fPipelineBuilder;
         const GrCaps*               fCaps;
         GrPipelineOptimizations     fOpts;
         const GrScissorState*       fScissor;
-        int                         fNumStencilBits;
-        bool                        fHasStencilClip;
         GrXferProcessor::DstTexture fDstTexture;
     };
 
     /** Creates a pipeline into a pre-allocated buffer */
     static GrPipeline* CreateAt(void* memory, const CreateArgs&, GrXPOverridesForBatch*);
 
     /// @}
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Comparisons
@@ skipping 145 matching lines @@
     FragmentProcessorArray              fFragmentProcessors;
     bool                                fIgnoresCoverage;
 
     // This value is also the index in fFragmentProcessors where coverage processors begin.
     int                                 fNumColorProcessors;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif