Clarify GrGradientEffect key enum

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2158323003

Review-Url: https://codereview.chromium.org/2158323003

1 files changed, 6 insertions, 13 deletions

diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 0280fcac8c..16c6475e33 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -427,20 +427,13 @@ protected:
 
 private:
     enum {
-        kPremulTypeKeyBitCnt = 1,
-        kPremulTypeMask = 1,
-        kPremulBeforeInterpKey = kPremulTypeMask,
-
-        kTwoColorKey = 2 << kPremulTypeKeyBitCnt,
-        kThreeColorKey = 3 << kPremulTypeKeyBitCnt,
-        kColorKeyMask = kTwoColorKey | kThreeColorKey,
-        kColorKeyBitCnt = 2,
-
-        // Subclasses must shift any key bits they produce up by this amount
-        // and combine with the result of GenBaseGradientKey.
-        kBaseKeyBitCnt = (kPremulTypeKeyBitCnt + kColorKeyBitCnt)
+        // First bit for premul before/after interp
+        kPremulBeforeInterpKey = 1,
+
+        // Next two bits for 2/3 color type (neither means using texture atlas)
+        kTwoColorKey   = 4,
+        kThreeColorKey = 6,
     };
-    GR_STATIC_ASSERT(kBaseKeyBitCnt <= 32);
 
     SkScalar fCachedYCoord;
     GrGLSLProgramDataManager::UniformHandle fFSYUni;