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

Unified Diff: include/gpu/GrEffect.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/GrDrawEffect.h ('k') | include/gpu/GrEffectStage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrEffect.h
diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h
index 20dc5dadc7ef2812cc7cba85eed20e310c3db36a..d8757b2cede75e3d40d718682e45c17cb3fda96f 100644
--- a/include/gpu/GrEffect.h
+++ b/include/gpu/GrEffect.h
@@ -167,7 +167,7 @@ public:
/** Useful for effects that want to insert a texture matrix that is implied by the texture
dimensions */
static inline SkMatrix MakeDivByTextureWHMatrix(const GrTexture* texture) {
- GrAssert(NULL != texture);
+ SkASSERT(NULL != texture);
SkMatrix mat;
mat.setIDiv(texture->width(), texture->height());
return mat;
@@ -235,7 +235,7 @@ protected:
/** Used by GR_CREATE_STATIC_EFFECT below */
static GrEffectRef* CreateStaticEffectRef(void* refStorage, GrEffect* effect) {
- GrAssert(NULL == effect->fEffectRef);
+ SkASSERT(NULL == effect->fEffectRef);
effect->fEffectRef = SkNEW_PLACEMENT_ARGS(refStorage, GrEffectRef, (effect));
return effect->fEffectRef;
}
@@ -289,9 +289,9 @@ private:
bool result = this->onIsEqual(other);
#if GR_DEBUG
if (result) {
- GrAssert(this->numTextures() == other.numTextures());
+ SkASSERT(this->numTextures() == other.numTextures());
for (int i = 0; i < this->numTextures(); ++i) {
- GrAssert(*fTextureAccesses[i] == *other.fTextureAccesses[i]);
+ SkASSERT(*fTextureAccesses[i] == *other.fTextureAccesses[i]);
}
}
#endif
@@ -320,7 +320,7 @@ private:
};
inline GrEffectRef::GrEffectRef(GrEffect* effect) {
- GrAssert(NULL != effect);
+ SkASSERT(NULL != effect);
effect->ref();
fEffect = effect;
}
« no previous file with comments | « include/gpu/GrDrawEffect.h ('k') | include/gpu/GrEffectStage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698