cleanup reentrance logic in CMM

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
 
@@ skipping 22 matching lines @@
  * aliasing is requested it will (in the future) generate a single channel
  * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
  * mask in the stencil buffer. In the non anti-aliasing case, if the clip
  * 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()
         : fCurrClipMaskType(kNone_ClipMaskType)
-        , fClipTarget(NULL) {
+        , fClipTarget(NULL)
+        , fClipMode(kIgnoreClip_StencilClipMode) {
     }
 
     // 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;
@@ skipping 33 matching lines @@
 
     GrContext* getContext() {
         return fAACache.getContext();
     }
 
     void setClipTarget(GrClipTarget*);
 
     void adjustPathStencilParams(GrStencilSettings*);
 
 private:
-    enum PrivateDrawStateStateBits {
-        kFirstBit = (GrDrawState::kLastPublicStateBit << 1),
-
-        kModifyStencilClip_StateBit = kFirstBit, // allows draws to modify
-                                                 // stencil bits used for
-                                                 // clipping.
-    };
-
     /**
      * Informs the helper function adjustStencilParams() about how the stencil
      * buffer clip is being used.
      */
     enum StencilClipMode {
         // Draw to the clip bit of the stencil buffer
         kModifyClip_StencilClipMode,
         // Clip against the existing representation of the clip in the high bit
         // of the stencil buffer.
         kRespectClip_StencilClipMode,
@@ skipping 80 matching lines @@
      * texture. It may be neither because the scissor rect suffices or we
      * haven't yet examined the clip.
      */
     enum ClipMaskType {
         kNone_ClipMaskType,
         kStencil_ClipMaskType,
         kAlpha_ClipMaskType,
     } fCurrClipMaskType;
 
     GrClipMaskCache fAACache;       // cache for the AA path
-    GrClipTarget* fClipTarget;
+    GrClipTarget*   fClipTarget;
+    StencilClipMode fClipMode;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskManager_DEFINED