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

Unified Diff: src/gpu/GrDrawTarget.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 | « src/gpu/GrDrawState.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 9501d96301bf015f545dce56db3d8dbec215c5c5..0c91fb894a8f98a89d007f53c49d8c247564c166 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -539,8 +539,8 @@ public:
int vertexCount,
int indexCount);
bool succeeded() const { return NULL != fTarget; }
- void* vertices() const { GrAssert(this->succeeded()); return fVertices; }
- void* indices() const { GrAssert(this->succeeded()); return fIndices; }
+ void* vertices() const { SkASSERT(this->succeeded()); return fVertices; }
+ void* indices() const { SkASSERT(this->succeeded()); return fIndices; }
GrPoint* positions() const {
return static_cast<GrPoint*>(this->vertices());
}
@@ -584,7 +584,7 @@ public:
public:
AutoGeometryPush(GrDrawTarget* target)
: fAttribRestore(target->drawState()) {
- GrAssert(NULL != target);
+ SkASSERT(NULL != target);
fTarget = target;
target->pushGeometrySource();
}
@@ -606,7 +606,7 @@ public:
ASRInit init,
const SkMatrix* viewMatrix = NULL)
: fState(target, init, viewMatrix) {
- GrAssert(NULL != target);
+ SkASSERT(NULL != target);
fTarget = target;
target->pushGeometrySource();
if (kPreserve_ASRInit == init) {
@@ -719,7 +719,7 @@ protected:
// it is preferable to call this rather than getGeomSrc()->fVertexSize because of the assert.
size_t getVertexSize() const {
// the vertex layout is only valid if a vertex source has been specified.
- GrAssert(this->getGeomSrc().fVertexSrc != kNone_GeometrySrcType);
+ SkASSERT(this->getGeomSrc().fVertexSrc != kNone_GeometrySrcType);
return this->getGeomSrc().fVertexSize;
}
« no previous file with comments | « src/gpu/GrDrawState.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698