Revert of Separate user and raw stencil settings

src/gpu/GrPipelineBuilder.cpp

Index: src/gpu/GrPipelineBuilder.cpp
diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
index 4731cbbbe1d2f3bbdb60cad04a21b5cfe2de68a3..1fd568e3664cb41ad2f064448b6c5bdd668075a6 100644
--- a/src/gpu/GrPipelineBuilder.cpp
+++ b/src/gpu/GrPipelineBuilder.cpp
@@ -16,14 +16,11 @@
 #include "effects/GrPorterDuffXferProcessor.h"
 
 GrPipelineBuilder::GrPipelineBuilder()
-    : fFlags(0x0),
-      fUserStencilSettings(&GrUserStencilSettings::kUnused),
-      fDrawFace(kBoth_DrawFace) {
+    : fFlags(0x0), fDrawFace(kBoth_DrawFace) {
     SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
 }
 
-GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip)
-    : GrPipelineBuilder() {
+GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip) {
     SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
 
     for (int i = 0; i < paint.numColorFragmentProcessors(); ++i) {
@@ -37,6 +34,11 @@
     fXPFactory.reset(SkSafeRef(paint.getXPFactory()));
 
     this->setRenderTarget(rt);
+
+    // These have no equivalent in GrPaint, set them to defaults
+    fDrawFace = kBoth_DrawFace;
+    fStencilSettings.setDisabled();
+    fFlags = 0;
 
     fClip = clip;