| Index: src/gpu/GrTextureAccess.cpp
|
| diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
|
| index 91db08bea5438543313be4c81934bd0a6bcb5f7e..b0c760f05440183722e136e9a8140d32dbc58b30 100644
|
| --- a/src/gpu/GrTextureAccess.cpp
|
| +++ b/src/gpu/GrTextureAccess.cpp
|
| @@ -42,7 +42,7 @@ GrTextureAccess::GrTextureAccess(GrTexture* texture,
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const char* swizzle,
|
| const GrTextureParams& params) {
|
| - SkASSERT(NULL != texture);
|
| + SkASSERT(texture);
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams = params;
|
| @@ -54,7 +54,7 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| const char* swizzle,
|
| GrTextureParams::FilterMode filterMode,
|
| SkShader::TileMode tileXAndY) {
|
| - SkASSERT(NULL != texture);
|
| + SkASSERT(texture);
|
| SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
|
|
|
| fParams.reset(tileXAndY, filterMode);
|
| @@ -64,7 +64,7 @@ void GrTextureAccess::reset(GrTexture* texture,
|
|
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| const GrTextureParams& params) {
|
| - SkASSERT(NULL != texture);
|
| + SkASSERT(texture);
|
| fTexture.reset(SkRef(texture));
|
| fParams = params;
|
| memcpy(fSwizzle, "rgba", 5);
|
| @@ -74,7 +74,7 @@ void GrTextureAccess::reset(GrTexture* texture,
|
| void GrTextureAccess::reset(GrTexture* texture,
|
| GrTextureParams::FilterMode filterMode,
|
| SkShader::TileMode tileXAndY) {
|
| - SkASSERT(NULL != texture);
|
| + SkASSERT(texture);
|
| fTexture.reset(SkRef(texture));
|
| fParams.reset(tileXAndY, filterMode);
|
| memcpy(fSwizzle, "rgba", 5);
|
|
|