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

Unified Diff: src/gpu/GrDefaultPathRenderer.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | src/gpu/GrDrawState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDefaultPathRenderer.cpp
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 6d16fb63fe9a941c7445d74d20c44439230e2fa8..1f33e95a77040d7249ddadf2d41e569b36d30345 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -241,7 +241,7 @@ bool GrDefaultPathRenderer::createGeom(const SkPath& path,
uint16_t subpathIdxStart = 0;
GrPoint* base = reinterpret_cast<GrPoint*>(arg->vertices());
- GrAssert(NULL != base);
+ SkASSERT(NULL != base);
GrPoint* vert = base;
GrPoint pts[4];
@@ -314,8 +314,8 @@ bool GrDefaultPathRenderer::createGeom(const SkPath& path,
first = false;
}
FINISHED:
- GrAssert((vert - base) <= maxPts);
- GrAssert((idx - idxBase) <= maxIdxs);
+ SkASSERT((vert - base) <= maxPts);
+ SkASSERT((idx - idxBase) <= maxIdxs);
*vertexCnt = vert - base;
*indexCnt = idx - idxBase;
@@ -348,12 +348,12 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
return false;
}
- GrAssert(NULL != target);
+ SkASSERT(NULL != target);
GrDrawTarget::AutoStateRestore asr(target, GrDrawTarget::kPreserve_ASRInit);
GrDrawState* drawState = target->drawState();
bool colorWritesWereDisabled = drawState->isColorWriteDisabled();
// face culling doesn't make sense here
- GrAssert(GrDrawState::kBoth_DrawFace == drawState->getDrawFace());
+ SkASSERT(GrDrawState::kBoth_DrawFace == drawState->getDrawFace());
int passCount = 0;
const GrStencilSettings* passes[3];
@@ -441,7 +441,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
}
break;
default:
- GrAssert(!"Unknown path fFill!");
+ SkASSERT(!"Unknown path fFill!");
return false;
}
}
@@ -463,7 +463,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
SkRect bounds;
GrDrawState::AutoViewMatrixRestore avmr;
if (reverse) {
- GrAssert(NULL != drawState->getRenderTarget());
+ SkASSERT(NULL != drawState->getRenderTarget());
// draw over the dev bounds (which will be the whole dst surface for inv fill).
bounds = devBounds;
SkMatrix vmi;
@@ -515,7 +515,7 @@ bool GrDefaultPathRenderer::onDrawPath(const SkPath& path,
void GrDefaultPathRenderer::onStencilPath(const SkPath& path,
const SkStrokeRec& stroke,
GrDrawTarget* target) {
- GrAssert(SkPath::kInverseEvenOdd_FillType != path.getFillType());
- GrAssert(SkPath::kInverseWinding_FillType != path.getFillType());
+ SkASSERT(SkPath::kInverseEvenOdd_FillType != path.getFillType());
+ SkASSERT(SkPath::kInverseWinding_FillType != path.getFillType());
this->internalDrawPath(path, stroke, target, true);
}
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | src/gpu/GrDrawState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698