src/gpu/GrTextureAccess.cpp - Issue 22850006: Replace uses of GrAssert by SkASSERT.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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 »