cleanup reentrance logic in CMM

src/gpu/GrDrawState.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawState_DEFINED
 #define GrDrawState_DEFINED
 
@@ skipping 600 matching lines @@
 
         /**
          * Usually coverage is applied after color blending. The color is blended using the coeffs
          * specified by setBlendFunc(). The blended color is then combined with dst using coeffs
          * of src_coverage, 1-src_coverage. Sometimes we are explicitly drawing a coverage mask. In
          * this case there is no distinction between coverage and color and the caller needs direct
          * control over the blend coeffs. When set, there will be a single blend step controlled by
          * setBlendFunc() which will use coverage*color as the src color.
          */
          kCoverageDrawing_StateBit = 0x10,
-
-        // Users of the class may add additional bits to the vector
-        kDummyStateBit,
-        kLastPublicStateBit = kDummyStateBit-1,
+         kLast_StateBit = kCoverageDrawing_StateBit,
     };
 
     uint32_t getFlagBits() const { return fFlagBits; }
 
     bool isStateFlagEnabled(uint32_t stateBit) const { return 0 != (stateBit & fFlagBits); }
 
     bool isClipState() const { return 0 != (fFlagBits & kClip_StateBit); }
     bool isColorWriteDisabled() const { return 0 != (fFlagBits & kNoColorWrites_StateBit); }
     bool isCoverageDrawing() const { return 0 != (fFlagBits & kCoverageDrawing_StateBit); }
 
@@ skipping 221 matching lines @@
     mutable uint32_t fCachedCapsID;
 
     friend class GrOptDrawState;
 
     typedef SkRefCnt INHERITED;
 };
 
 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
 
 #endif