Clip mask manager sets stencil on draw type

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index c98648b1287725116c859ce263f58b7668ca653b..8a4b45a82e2d016445123b05f174ef1c058f75e9 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -50,7 +50,9 @@ public:
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
-    bool setupClipping(const GrClipData* clipDataIn, GrDrawState::AutoRestoreEffects*,
+    bool setupClipping(const GrClipData* clipDataIn,
+                       GrDrawState::AutoRestoreEffects*,
+                       GrDrawState::AutoRestoreStencil*,
                        const SkRect* devBounds);
 
     /**
@@ -173,7 +175,7 @@ private:
      * updates the GrGpu with stencil settings that account stencil-based
      * clipping.
      */
-    void setGpuStencil();
+    void setDrawStateStencil(GrDrawState::AutoRestoreStencil* asr);
 
     /**
      * Adjusts the stencil settings to account for interaction with stencil