Revert of Clip mask manager sets stencil on draw type

src/gpu/GrGpu.cpp

Index: src/gpu/GrGpu.cpp
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index d8ffe6745d3271f05321ed1e3e64e0a66368674c..65100489f4b7ad01c94b83734440334bdd46a65d 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -298,12 +298,10 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool GrGpu::setupClipAndFlushState(DrawType type,
-                                   const GrDeviceCoordTexture* dstCopy,
+bool GrGpu::setupClipAndFlushState(DrawType type, const GrDeviceCoordTexture* dstCopy,
                                    GrDrawState::AutoRestoreEffects* are,
-                                   GrDrawState::AutoRestoreStencil* ars,
                                    const SkRect* devBounds) {
-    if (!fClipMaskManager.setupClipping(this->getClip(), are, ars, devBounds)) {
+    if (!fClipMaskManager.setupClipping(this->getClip(), are, devBounds)) {
         return false;
     }
 
@@ -346,9 +344,8 @@
 void GrGpu::onDraw(const DrawInfo& info) {
     this->handleDirtyContext();
     GrDrawState::AutoRestoreEffects are;
-    GrDrawState::AutoRestoreStencil asr;
     if (!this->setupClipAndFlushState(PrimTypeToDrawType(info.primitiveType()),
-                                      info.getDstCopy(), &are, &asr, info.getDevBounds())) {
+                                      info.getDstCopy(), &are, info.getDevBounds())) {
         return;
     }
     this->onGpuDraw(info);
@@ -358,8 +355,7 @@
     this->handleDirtyContext();
 
     GrDrawState::AutoRestoreEffects are;
-    GrDrawState::AutoRestoreStencil asr;
-    if (!this->setupClipAndFlushState(kStencilPath_DrawType, NULL, &are, &asr, NULL)) {
+    if (!this->setupClipAndFlushState(kStencilPath_DrawType, NULL, &are, NULL)) {
         return;
     }
 
@@ -374,8 +370,7 @@
     drawState()->setDefaultVertexAttribs();
 
     GrDrawState::AutoRestoreEffects are;
-    GrDrawState::AutoRestoreStencil asr;
-    if (!this->setupClipAndFlushState(kDrawPath_DrawType, dstCopy, &are, &asr, NULL)) {
+    if (!this->setupClipAndFlushState(kDrawPath_DrawType, dstCopy, &are, NULL)) {
         return;
     }
 
@@ -391,8 +386,7 @@
     drawState()->setDefaultVertexAttribs();
 
     GrDrawState::AutoRestoreEffects are;
-    GrDrawState::AutoRestoreStencil asr;
-    if (!this->setupClipAndFlushState(kDrawPaths_DrawType, dstCopy, &are, &asr, NULL)) {
+    if (!this->setupClipAndFlushState(kDrawPaths_DrawType, dstCopy, &are, NULL)) {
         return;
     }