src/gpu/GrAtlas.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/GrAtlas.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:

Index: src/gpu/GrAtlas.cpp

diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp

index 5207061a8a8765159e42dac6a4f3317bb797fadb..9184929efc9e1bc034b3f7028989d766b57cd96c 100644

--- a/src/gpu/GrAtlas.cpp

+++ b/src/gpu/GrAtlas.cpp

@@ -198,7 +198,7 @@ GrAtlas* GrAtlasMgr::addToAtlas(GrAtlas** atlas,

int width, int height, const void* image,

GrMaskFormat format,

GrIPoint16* loc) {

- GrAssert(NULL == *atlas || (*atlas)->getMaskFormat() == format);

+ SkASSERT(NULL == *atlas || (*atlas)->getMaskFormat() == format);

// iterate through entire atlas list, see if we can find a hole

GrAtlas* atlasIter = *atlas;

« no previous file with comments | « src/gpu/GrAtlas.h ('k') | src/gpu/GrBinHashKey.h » ('j') | no next file with comments »