clear stencil clip on draw target

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
 #include "GrClipMaskCache.h"
 #include "GrContext.h"
 #include "GrDrawState.h"
-#include "GrDrawTarget.h"
 #include "GrReducedClip.h"
 #include "GrStencil.h"
 #include "GrTexture.h"
 
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
 #include "SkRefCnt.h"
 #include "SkTLList.h"
 #include "SkTypes.h"
@@ skipping 12 matching lines @@
  * mask can be represented as a rectangle then scissoring is used. In all
  * cases scissoring is used to bound the range of the clip mask.
  */
 class GrClipMaskManager : SkNoncopyable {
 public:
     GrClipMaskManager()
         : fGpu(NULL)
         , fCurrClipMaskType(kNone_ClipMaskType) {
     }
 
+    // The state of the scissor is controlled by the clip manager, no one else should set
+    // Scissor state.  This should really be on Gpu itself.  We should revist this when GPU
+    // and drawtarget are separate
+    struct ScissorState {
+        ScissorState() : fEnabled(false) {}
+        void set(const SkIRect& rect) { fRect = rect; fEnabled = true; }
+        bool    fEnabled;
+        SkIRect fRect;
+    };
+
     /**
      * Creates a clip mask if necessary as a stencil buffer or alpha texture
      * and sets the GrGpu's scissor and stencil state. If the return is false
      * then the draw can be skipped. The AutoRestoreEffects is initialized by
      * 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,
                        const SkRect* devBounds,
                        GrDrawState::AutoRestoreEffects*,
                        GrDrawState::AutoRestoreStencil*,
-                       GrDrawTarget::ScissorState* scissorState);
+                       ScissorState* scissorState);
 
     /**
      * Purge resources to free up memory. TODO: This class shouldn't hold any long lived refs
      * which will allow ResourceCache2 to automatically purge anything this class has created.
      */
     void purgeResources();
 
     bool isClipInStencil() const {
         return kStencil_ClipMaskType == fCurrClipMaskType;
     }
@@ skipping 115 matching lines @@
      * clipping.
      */
     void adjustStencilParams(GrStencilSettings* settings,
                              StencilClipMode mode,
                              int stencilBitCnt);
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskManager_DEFINED