| Index: include/core/SkColorPriv.h | 
| diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h | 
| index d5571dfea970bdc627595e532f780c1d96d31008..8fd1e57fa7ffdf18653eda421f3cad634b37f8f8 100644 | 
| --- a/include/core/SkColorPriv.h | 
| +++ b/include/core/SkColorPriv.h | 
| @@ -524,10 +524,8 @@ SkPMColor SkPremultiplyARGBInline(U8CPU a, U8CPU r, U8CPU g, U8CPU b) { | 
| return SkPackARGB32(a, r, g, b); | 
| } | 
|  | 
| -SK_API extern const uint32_t gMask_00FF00FF; | 
| - | 
| static inline uint32_t SkAlphaMulQ(uint32_t c, unsigned scale) { | 
| -    uint32_t mask = gMask_00FF00FF; | 
| +    uint32_t mask = 0xFF00FF; | 
|  | 
| uint32_t rb = ((c & mask) * scale) >> 8; | 
| uint32_t ag = ((c >> 8) & mask) * scale; | 
| @@ -787,8 +785,6 @@ static inline SkPMColor16 SkPackARGB4444(unsigned a, unsigned r, | 
| (g << SK_G4444_SHIFT) | (b << SK_B4444_SHIFT)); | 
| } | 
|  | 
| -extern const uint16_t gMask_0F0F; | 
| - | 
| static inline U16CPU SkAlphaMulQ4(U16CPU c, unsigned scale) { | 
| SkASSERT(scale <= 16); | 
|  | 
|  |