cleanup reentrance logic in CMM

cleanup reentrance logic in CMM

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/7a6184fdf717a1da0c6e1e37b942b17fdaa236d3

[joshualitt, 2014-10-29 15:39:17]

joshualitt@google.com changed reviewers:
+ bsalomon@google.com, joshualitt@google.com

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

https://codereview.chromium.org/684223002/diff/1/src/gpu/GrClipMaskManager.cpp
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/684223002/diff/1/src/gpu/GrClipMaskManager.cp...
src/gpu/GrClipMaskManager.cpp:851: if (drawState->isClipState()) {
Can we get here w/o this condition being true? I don't think so, but if it is
possible shouldn't we be setting fClipMode to kIgnore in that case?

https://codereview.chromium.org/684223002/diff/1/src/gpu/GrClipMaskManager.h
File src/gpu/GrClipMaskManager.h (left):

https://codereview.chromium.org/684223002/diff/1/src/gpu/GrClipMaskManager.h#...
src/gpu/GrClipMaskManager.h:98: kFirstBit = (GrDrawState::kLastPublicStateBit <<
1),
maybe delete kLastPublicStateBit as well?

[joshualitt, 2014-10-29 21:27:36]

feedback incorporated

[bsalomon, 2014-10-30 00:50:09]

lgtm

[joshualitt, 2014-10-30 01:21:37]

The CQ bit was checked by joshualitt@google.com

[commit-bot: I haz the power, 2014-10-30 01:22:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/684223002/40001

[commit-bot: I haz the power, 2014-10-30 01:29:31]

Committed patchset #3 (id:40001) as 7a6184fdf717a1da0c6e1e37b942b17fdaa236d3