Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: src/gpu/GrTextureAccess.cpp

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrTextureAccess.cpp
diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
index ae6c04222fe98e5ce1241d83a19104d676c32258..122a2090aad508c4b79dcd05ae2cef57c0cc6c9d 100644
--- a/src/gpu/GrTextureAccess.cpp
+++ b/src/gpu/GrTextureAccess.cpp
@@ -42,8 +42,8 @@ GrTextureAccess::GrTextureAccess(GrTexture* texture,
void GrTextureAccess::reset(GrTexture* texture,
const char* swizzle,
const GrTextureParams& params) {
- GrAssert(NULL != texture);
- GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
+ SkASSERT(NULL != texture);
+ SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
fParams = params;
fTexture.reset(SkRef(texture));
@@ -54,8 +54,8 @@ void GrTextureAccess::reset(GrTexture* texture,
const char* swizzle,
GrTextureParams::FilterMode filterMode,
SkShader::TileMode tileXAndY) {
- GrAssert(NULL != texture);
- GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
+ SkASSERT(NULL != texture);
+ SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
fParams.reset(tileXAndY, filterMode);
fTexture.reset(SkRef(texture));
@@ -64,7 +64,7 @@ void GrTextureAccess::reset(GrTexture* texture,
void GrTextureAccess::reset(GrTexture* texture,
const GrTextureParams& params) {
- GrAssert(NULL != texture);
+ SkASSERT(NULL != 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) {
- GrAssert(NULL != texture);
+ SkASSERT(NULL != texture);
fTexture.reset(SkRef(texture));
fParams.reset(tileXAndY, filterMode);
memcpy(fSwizzle, "rgba", 5);
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698