Revert of Separate user and raw stencil settings

src/gpu/batches/GrDrawPathBatch.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 GrDrawPathBatch_DEFINED
 #define GrDrawPathBatch_DEFINED
 
@@ skipping 10 matching lines @@
 public:
     void computePipelineOptimizations(GrInitInvariantOutput* color,
                                       GrInitInvariantOutput* coverage,
                                       GrBatchToXPOverrides* overrides) const override {
         color->setKnownFourComponents(fColor);
         coverage->setKnownSingleComponent(0xff);
     }
 
     GrPathRendering::FillType fillType() const { return fFillType; }
 
-    void setStencilSettings(const GrUserStencilSettings& stencil, bool hasStencilClip,
-                            int numStencilBits) {
-        fStencilSettings.reset(stencil, hasStencilClip, numStencilBits);
-    }
+    void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
 
 protected:
     GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor,
                         GrPathRendering::FillType fill)
         : INHERITED(classID)
         , fViewMatrix(viewMatrix)
         , fColor(initialColor)
         , fFillType(fill) {}
 
     const GrStencilSettings& stencilSettings() const { return fStencilSettings; }
@@ skipping 158 matching lines @@
 
     PendingPathRange    fPathRange;
     DrawList            fDraws;
     int                 fTotalPathCount;
     SkScalar            fScale;
 
     typedef GrDrawPathBatchBase INHERITED;
 };
 
 #endif