Move scissor state to GrAppliedClip

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 3ce3e72bf1c5c567ddbe25b2b48a7184d01604b6..9b5607eff25cc5871f09b8b456d4dfb3cef50c54 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -34,9 +34,11 @@ class GrAppliedClip : public SkNoncopyable {
 public:
     GrAppliedClip() {}
     const GrFragmentProcessor* clipCoverageFragmentProcessor() const { return fClipCoverageFP; }
+    const GrScissorState& scissorState() const { return fScissorState; }
 
 private:
     SkAutoTUnref<const GrFragmentProcessor> fClipCoverageFP;
+    GrScissorState                          fScissorState;
     friend class GrClipMaskManager;
 
     typedef SkNoncopyable INHERITED;
@@ -63,7 +65,6 @@ public:
      */
     bool setupClipping(const GrPipelineBuilder&,
                        GrPipelineBuilder::AutoRestoreStencil*,
-                       GrScissorState*,
                        const SkRect* devBounds,
                        GrAppliedClip*);