Index: include/gpu/GrSurface.h |
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h |
index eeb63ad21bfd7f85d125430fb66b25360e6b36b7..3aa498b6110bb00c4a0b130aedc031678ec58705 100644 |
--- a/include/gpu/GrSurface.h |
+++ b/include/gpu/GrSurface.h |
@@ -41,7 +41,7 @@ public: |
SkIntToScalar(this->height())); } |
GrSurfaceOrigin origin() const { |
- GrAssert(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin); |
+ SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin); |
return fDesc.fOrigin; |
} |
@@ -81,7 +81,7 @@ public: |
return thisRT == other->asRenderTarget(); |
} else { |
const GrTexture* thisTex = this->asTexture(); |
- GrAssert(NULL != thisTex); // We must be one or the other |
+ SkASSERT(NULL != thisTex); // We must be one or the other |
return thisTex == other->asTexture(); |
} |
} |