cleanup reentrance logic in CMM

BUG=skia:

Review URL: https://codereview.chromium.org/684223002