| Index: include/gpu/GrColor.h
|
| diff --git a/include/gpu/GrColor.h b/include/gpu/GrColor.h
|
| index 3ded8fbe01bd0e7cf8b23bcd836b26ee2d7d7404..cf7e7df8431b2ee3f09c7eba9bc5d85f96b725eb 100644
|
| --- a/include/gpu/GrColor.h
|
| +++ b/include/gpu/GrColor.h
|
| @@ -35,10 +35,10 @@ typedef uint32_t GrColor;
|
| */
|
| static inline GrColor GrColorPackRGBA(unsigned r, unsigned g,
|
| unsigned b, unsigned a) {
|
| - GrAssert((uint8_t)r == r);
|
| - GrAssert((uint8_t)g == g);
|
| - GrAssert((uint8_t)b == b);
|
| - GrAssert((uint8_t)a == a);
|
| + SkASSERT((uint8_t)r == r);
|
| + SkASSERT((uint8_t)g == g);
|
| + SkASSERT((uint8_t)b == b);
|
| + SkASSERT((uint8_t)a == a);
|
| return (r << GrColor_SHIFT_R) |
|
| (g << GrColor_SHIFT_G) |
|
| (b << GrColor_SHIFT_B) |
|
| @@ -85,7 +85,7 @@ enum GrColorComponentFlags {
|
| };
|
|
|
| static inline char GrColorComponentFlagToChar(GrColorComponentFlags component) {
|
| - GrAssert(GrIsPow2(component));
|
| + SkASSERT(GrIsPow2(component));
|
| switch (component) {
|
| case kR_GrColorComponentFlag:
|
| return 'r';
|
| @@ -102,7 +102,7 @@ static inline char GrColorComponentFlagToChar(GrColorComponentFlags component) {
|
| }
|
|
|
| static inline uint32_t GrPixelConfigComponentMask(GrPixelConfig config) {
|
| - GrAssert(config >= 0 && config < kGrPixelConfigCnt);
|
| + SkASSERT(config >= 0 && config < kGrPixelConfigCnt);
|
| static const uint32_t kFlags[] = {
|
| 0, // kUnknown_GrPixelConfig
|
| kA_GrColorComponentFlag, // kAlpha_8_GrPixelConfig
|
|
|