| Index: src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| index d1c7fea16d0276bb373a239a85ac4c6defda61a0..2290cb930e750600acd241368de5ce38c20bb362 100644
 | 
| --- a/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| +++ b/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| @@ -39,7 +39,7 @@ public:
 | 
|                                       coordsType);
 | 
|          builder->fsCodeAppend(";\n");
 | 
|          if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) {
 | 
| -            GrAssert(fSwapRedAndBlue);
 | 
| +            SkASSERT(fSwapRedAndBlue);
 | 
|              builder->fsCodeAppendf("\t%s = %s.bgra;\n", outputColor, outputColor);
 | 
|          } else {
 | 
|              const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb";
 | 
| @@ -89,7 +89,7 @@ public:
 | 
|                                                          drawEffect,
 | 
|                                                          conv.coordsType(),
 | 
|                                                          conv.texture(0));
 | 
| -        GrAssert(!(matrixKey & key));
 | 
| +        SkASSERT(!(matrixKey & key));
 | 
|          return matrixKey | key;
 | 
|      }
 | 
|  
 | 
| @@ -111,10 +111,10 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture,
 | 
|      : GrSingleTextureEffect(texture, matrix)
 | 
|      , fSwapRedAndBlue(swapRedAndBlue)
 | 
|      , fPMConversion(pmConversion) {
 | 
| -    GrAssert(kRGBA_8888_GrPixelConfig == texture->config() ||
 | 
| +    SkASSERT(kRGBA_8888_GrPixelConfig == texture->config() ||
 | 
|               kBGRA_8888_GrPixelConfig == texture->config());
 | 
|      // Why did we pollute our texture cache instead of using a GrSingleTextureEffect?
 | 
| -    GrAssert(swapRedAndBlue || kNone_PMConversion != pmConversion);
 | 
| +    SkASSERT(swapRedAndBlue || kNone_PMConversion != pmConversion);
 | 
|  }
 | 
|  
 | 
|  const GrBackendEffectFactory& GrConfigConversionEffect::getFactory() const {
 | 
| 
 |