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

Unified Diff: include/gpu/GrContext.h

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 | « include/gpu/GrConfig.h ('k') | include/gpu/GrDrawEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrContext.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 13df5ce3edb8012cc31b4c4dba6b00d992f42845..759c7e4aeefe98eb88012ab99905ba58ecaa0d13 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -678,7 +678,7 @@ public:
* Initializes by pre-concat'ing the context's current matrix with the preConcat param.
*/
void setPreConcat(GrContext* context, const SkMatrix& preConcat, GrPaint* paint = NULL) {
- GrAssert(NULL != context);
+ SkASSERT(NULL != context);
this->restore();
@@ -692,7 +692,7 @@ public:
* update a paint but the matrix cannot be inverted.
*/
bool setIdentity(GrContext* context, GrPaint* paint = NULL) {
- GrAssert(NULL != context);
+ SkASSERT(NULL != context);
this->restore();
@@ -772,7 +772,7 @@ public:
AutoClip(GrContext* context, InitialClip initialState)
: fContext(context) {
- GrAssert(kWideOpen_InitialClip == initialState);
+ SkASSERT(kWideOpen_InitialClip == initialState);
fNewClipData.fClipStack = &fNewClipStack;
fOldClip = context->getClip();
@@ -808,7 +808,7 @@ public:
, fAutoRT(ctx, rt) {
fAutoMatrix.setIdentity(ctx);
// should never fail with no paint param.
- GrAssert(fAutoMatrix.succeeded());
+ SkASSERT(fAutoMatrix.succeeded());
}
private:
@@ -987,10 +987,10 @@ public:
// The cache also has a ref which we are lending to the caller of detach(). When the caller
// lets go of the ref and the ref count goes to 0 internal_dispose will see this flag is
// set and re-ref the texture, thereby restoring the cache's ref.
- GrAssert(texture->getRefCnt() > 1);
+ SkASSERT(texture->getRefCnt() > 1);
texture->setFlag((GrTextureFlags) GrTexture::kReturnToCache_FlagBit);
texture->unref();
- GrAssert(NULL != texture->getCacheEntry());
+ SkASSERT(NULL != texture->getCacheEntry());
return texture;
}
« no previous file with comments | « include/gpu/GrConfig.h ('k') | include/gpu/GrDrawEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698