cleanup reentrance logic in CMM

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index e4d7223c7e0cdc807d795da5f40020e5b39bb2e3..c38e1405b08e5f09b1e7c5354d7fb0eac88217bb 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -40,7 +40,8 @@ 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
@@ -94,14 +95,6 @@ public:
     void adjustPathStencilParams(GrStencilSettings*);
 
 private:
-    enum PrivateDrawStateStateBits {
-        kFirstBit = (GrDrawState::kLastPublicStateBit << 1),

[bsalomon, 2014/10/29 17:08:24]

maybe delete kLastPublicStateBit as well?

-
-        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.
@@ -202,7 +195,8 @@ private:
     } fCurrClipMaskType;
 
     GrClipMaskCache fAACache;       // cache for the AA path
-    GrClipTarget* fClipTarget;
+    GrClipTarget*   fClipTarget;
+    StencilClipMode fClipMode;
 
     typedef SkNoncopyable INHERITED;
 };